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:46:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-02 19:46:20 +0000
commit2bfad25b06773d33d280c23842eaafd46b4ba34d (patch)
tree7affc4379417d1ee635616141e943abb4b818f67 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent30aca837c84909383862748ca5483136f887a29e (diff)
parent0af2fdee4006fd66d13ef1c3cafbebab04cc1566 (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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions