summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorShibin George <shibing@codeaurora.org>2016-06-23 00:20:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-23 00:20:35 +0000
commit42927c4e94ab963d67e7b38f6533dfb37ac22ac6 (patch)
tree48c011424196024f931b9bda4ca08b2c74eda4ba /tools/aapt2/java/JavaClassGenerator_test.cpp
parent51f620d98dbb06bad73033973c0bea029955c478 (diff)
parent4eea3a7f883b7871d7ba64e4a92f795192fab9cc (diff)
Merge \"Fix deadlock b/w ActivityManagerService and MediaSessionService\"
am: 4eea3a7f88 Change-Id: I499c69fd3890ada652213c0510df3b884223a5df
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions