tree 10da860fcff71886af91d082e31f0e1917926848
parent 632e90bd7c045d14397770dd6bd945295f75cb7b
parent cb7898efbb5224a4f085bcff6c3f34aa0b9f5979
author Sunny Goyal <sunnygoyal@google.com> 1422666451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666451 +0000

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

* commit 'cb7898efbb5224a4f085bcff6c3f34aa0b9f5979':