tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 35c0d1b7d5c3889a8c38134aba9a2e13ccbfea4d
parent 8c39721d1d9b7e53803fa39d146273f24ffdd13a
author Sunny Goyal <sunnygoyal@google.com> 1422685295 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685295 +0000

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

* commit '8c39721d1d9b7e53803fa39d146273f24ffdd13a':