diff options
| author | Marie Janssen <jamuraa@google.com> | 2016-10-31 18:54:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-31 18:54:23 +0000 |
| commit | 03836e31a94e942987d182588a861c40129e2dda (patch) | |
| tree | dbe4673c43c69731075d5188af8b0cd9edcc793c /cmds/bootanimation/BootAnimation.cpp | |
| parent | 10f8f2e95cebe992c3df60340fb2a6705109b8f0 (diff) | |
| parent | 635d52887704194420f6d1eb5cf6814d731ed1b0 (diff) | |
resolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec
am: 635d528877
Change-Id: I9a59aa4c657019ee06117591cb1a0bda4c67ea96
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
0 files changed, 0 insertions, 0 deletions