tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent d8aea23a270d25f99a7e96ac2968932eb960e247
parent 0e561cb6c0b7228115808edf5d737ad334cc3e9a
author Sunny Goyal <sunnygoyal@google.com> 1422669679 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669679 +0000

am 0e561cb6: am 8a5557de: am ac11d416: Merge "Updating virtual preloader assets" into ub-now-porkchop

* commit '0e561cb6c0b7228115808edf5d737ad334cc3e9a':