tree 10da860fcff71886af91d082e31f0e1917926848
parent 4e8a23a244a46fd8db5094aad73e2aa35a7a6f88
parent 8a5557de092ae22a7cf8cc200aec42af0ab70a50
author Sunny Goyal <sunnygoyal@google.com> 1422666461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666461 +0000

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

* commit '8a5557de092ae22a7cf8cc200aec42af0ab70a50':