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