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-22 15:58:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-22 15:58:52 +0000
commit51a3f42c9fd96c95d0b774295f2468136fd7b268 (patch)
treeaac8c142363ab9f0ebb8849c75d98990b5725288 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4342d0bf822850bed36d5a20f42f4f3125c1ab9f (diff)
parent44e9c3f57a13a2906f957e27b17f9675bb74b47b (diff)
Merge "Merge \\"Blacklist ATV Remote Service to never appear on Recents\\" into nyc-dev am: 8f41c074c7 am: 295322d954" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions