tree c757c3f9d7830cc3d1faf8499620ebd6a0bf757b
parent 0f3390f846ed5ee63e3926b78878c7b75ee2f0c0
parent fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226
author Nick Kralevich <nnk@google.com> 1387219444 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387219444 +0000

am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

* commit 'fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.