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