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