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 19:57:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-02 19:57:37 +0000
commit0c7267b69822ddba91f86d4112b94460bcf3e6d2 (patch)
tree8436915100ab06a84ce175c1f41b9d17e34ab2c7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent89ecf83fa68f47b403ca564ff2b45919f4b73909 (diff)
parent3d83246be38f4fd1465bf38ac15243ac8dec9ea7 (diff)
Merge "Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969" into nyc-mr1-dev-plus-aosp am: 2bfad25b06" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions