diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-12-02 20:35:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-02 20:35:05 +0000 |
| commit | c794493f2ed2f4a06ebcde001b0b252cc8803b92 (patch) | |
| tree | 24e56f5da884daf8808448206aee620ec19bdc75 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 68361d39515b0e6fa839973f87e3adec9390584e (diff) | |
| parent | 3d83246be38f4fd1465bf38ac15243ac8dec9ea7 (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
am: 3d83246be3 -s ours
Change-Id: Ia691ca2f22e62a2a3fa775eeaff1cb38e10178b4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions