diff options
| author | Chris Elliott <chriselliott@google.com> | 2015-12-02 22:46:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-02 22:46:11 +0000 |
| commit | a6ed5dcd044fdeec84b42472cb393ddf9315a0ae (patch) | |
| tree | ea946674ac235e253c63ab225023a19bdb1ca225 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5ec51457e1b899c3b85f480862851e9ff04f9f2f (diff) | |
| parent | 087d30c14243f38c28793877b8e5ad12d3a2b269 (diff) | |
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6
am: 087d30c142
* commit '087d30c14243f38c28793877b8e5ad12d3a2b269':
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions