summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChris Elliott <chriselliott@google.com>2015-12-02 21:57:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-12-02 21:57:06 +0000
commit087d30c14243f38c28793877b8e5ad12d3a2b269 (patch)
tree6be891c6d394a792ab8d33dc49ef69244de8e669 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0ede75507c43819d0417efe1f1ab5c626a608fc5 (diff)
parent8e79dae3f67aae032010ddbbef2f8032ace01263 (diff)
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
am: 8e79dae3f6 * commit '8e79dae3f67aae032010ddbbef2f8032ace01263': 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