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

Browse Source

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

...

This commit is contained in:

Doug Zongker

2014-03-12 20:11:06 +00:00

committed by Android Git Automerger

parent 18f72dc551 c15b7865ba

commit 4fff5aa7dc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available