diff options
| author | Chris Elliott <chriselliott@google.com> | 2015-12-01 21:27:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-01 21:27:33 +0000 |
| commit | 767e2b39db78e41241998b7b3941a15d68c6b4f2 (patch) | |
| tree | 6ecdff433fd273073ecfc907aa093e71961f032e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8f95fe4b71b54ee920d71b6b689b0e7f53994f00 (diff) | |
| parent | c54aa0c3f7660a6a35c5ea396ef89f95eefb7c13 (diff) | |
Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2
am: c54aa0c3f7
* commit 'c54aa0c3f7660a6a35c5ea396ef89f95eefb7c13':
MediaPlayer: Disable acquiring wakelocks based on property.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions