tree 10da860fcff71886af91d082e31f0e1917926848
parent d78b020cc0336ec36d5bdc17ee7237b0aeb67866
parent 317220002ed72f629f5880c91b5b73be29ffa21e
author Sunny Goyal <sunnygoyal@google.com> 1422666484 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666484 +0000

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

* commit '317220002ed72f629f5880c91b5b73be29ffa21e':