| commit | 4fff5aa7dcd4fd634e1fd11974e57e073c9567b0 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Wed Mar 12 20:11:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 20:11:06 2014 +0000 |
| tree | f5e8f087fb4367b02084791b3de75f44bb28be3a | |
| parent | 18f72dc551835ca6732ebaa7031c1f6b81f20329 [diff] | |
| parent | c15b7865badc3ac406a7ce978baa65151a50bb55 [diff] |
am c15b7865: (-s ours) resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp * commit 'c15b7865badc3ac406a7ce978baa65151a50bb55': change how recovery animation is implemented