tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 52985def455cd7d5875ca77bff3f6f18cde42900
parent 619e8c6e3be0ef5e77cf6c0207f719c9c1b9a97d
author Sunny Goyal <sunnygoyal@google.com> 1422669695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669695 +0000

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

* commit '619e8c6e3be0ef5e77cf6c0207f719c9c1b9a97d':