tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 8e01dd035a6b67b86672711e7daaf4342979ccd4
parent acdc4ac447229f14831c6e5398580d0924d37e66
author Sunny Goyal <sunnygoyal@google.com> 1422685285 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685285 +0000

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

* commit 'acdc4ac447229f14831c6e5398580d0924d37e66':