summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-08 01:23:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-08 01:23:04 +0000
commit22eaf715a1de99889988ff94930b7148e11d819c (patch)
tree54b7feac3cf501716e57805696b76d5e0a3b8303 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentba3676460a6f8d3f7766cf9768c275e6f8eda952 (diff)
parent5c689127ba3a1bfba8da407e4a4922cc6c1ae4cb (diff)
Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am: 723e5afa9e" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions