diff options
| author | Sridhar Vashist <svashist@motorola.com> | 2015-09-14 22:32:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-14 22:32:19 +0000 |
| commit | 992043b0a5ead96790721772eb1fb0aabf390906 (patch) | |
| tree | 63d78c3b5ba075e07bec61d6b9aba94f7962dbcc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4e557174289999ec8e32a92439ee1073eea073fe (diff) | |
| parent | d5749a8eb926eed1045c7b8ef3ae4c2e9b2cab98 (diff) | |
am d5749a8e: (-s ours) am c3504304: am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
* commit 'd5749a8eb926eed1045c7b8ef3ae4c2e9b2cab98':
DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions