tree c028bfe537607823c37e2ffc8c713c73059d3130
parent d0628f5ccfec24d60f7101e8413e7d83b3ccead4
parent aa1bf5b578df4d2229b8eaaa3337ef7ebb68e760
author Sunny Goyal <sunnygoyal@google.com> 1422685316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685316 +0000

am aa1bf5b5: am 619e8c6e: am 31722000: am e3b36d51: Merge "Updating Clings UI" into ub-now-porkchop

* commit 'aa1bf5b578df4d2229b8eaaa3337ef7ebb68e760':