summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2016-12-02 19:56:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-02 19:56:42 +0000
commit3d83246be38f4fd1465bf38ac15243ac8dec9ea7 (patch)
tree8436915100ab06a84ce175c1f41b9d17e34ab2c7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta5b6631392e3ea5cc2edad4bd09bf0474fb16ec1 (diff)
parent2bfad25b06773d33d280c23842eaafd46b4ba34d (diff)
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 Change-Id: I3945f337de1d941779a5f5018a86c87ca494bc9e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions