summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-12-02 20:02:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-02 20:02:07 +0000
commit18735cc1a53c0d5f49a17eca01937da2bf15903a (patch)
tree8436915100ab06a84ce175c1f41b9d17e34ab2c7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent24ce7d651f52d7708270a57a3af0593db3e3999c (diff)
parent9397f3c366d2d8d403d96081dff7a5af1aec8192 (diff)
Merge "Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev am: 2e73db5b9c" into nyc-mr1-dev-plus-aosp am: ed09e67751" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions