tree f5e8f087fb4367b02084791b3de75f44bb28be3a
parent 18f72dc551835ca6732ebaa7031c1f6b81f20329
parent c15b7865badc3ac406a7ce978baa65151a50bb55
author Doug Zongker <dougz@google.com> 1394655066 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394655066 +0000

am c15b7865: (-s ours) resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp

* commit 'c15b7865badc3ac406a7ce978baa65151a50bb55':
  change how recovery animation is implemented