tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 21fde4ba3dd709b4b17bdb523093fc13183e8485
parent 7a6071344d14267f6b1a30e2fb17586e88fe4c6b
author Sunny Goyal <sunnygoyal@google.com> 1422669672 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669672 +0000

am 7a607134: am cb7898ef: am e3a55a9f: Merge "Updating the virtual preloader UX." into ub-now-porkchop

* commit '7a6071344d14267f6b1a30e2fb17586e88fe4c6b':