tree e0b68aea605bb5b489237351ea40cf84bfbde2d2
parent f81eb912b0b7641433d042b4a50cd50b572dcff3
parent ac11d41686e38cb6e0f70f320e81d861ff9bedcb
author Sunny Goyal <sunnygoyal@google.com> 1408409416 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408409416 +0000

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

* commit 'ac11d41686e38cb6e0f70f320e81d861ff9bedcb':
  Updating virtual preloader assets