diff options
author | Sridhar Vashist <svashist@motorola.com> | 2015-09-14 22:17:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-14 22:17:14 +0000 |
commit | c350430490cce6b54a5c38f91e8a12d245332c18 (patch) | |
tree | 109ae17e0fe38980913f7474b310691a5d5de2f1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 31f01e2f2a4d322db9d25dc3b74da52f6851882f (diff) | |
parent | 92a420eb184015f9bae2d189ef335f86af9cbcbb (diff) |
am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
* commit '92a420eb184015f9bae2d189ef335f86af9cbcbb':
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