summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2016-12-02 20:25:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-02 20:25:37 +0000
commit3e4eadd96d78695bf227648aa5f171ebdfc757d1 (patch)
tree24e56f5da884daf8808448206aee620ec19bdc75 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfb439d65ea4b5ea814ba0e34018d845f2570a76b (diff)
parent70c962bdd64ad78201ede6e2e53f86c25e2c8979 (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 am: d01f22d0b2" into nyc-mr2-dev-plus-aosp
am: 70c962bdd6 -s ours Change-Id: Id92c124e3cf24b88ec031b0b7a4e298bf3f2a087
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions