diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-10-11 21:00:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 21:00:20 +0000 |
| commit | 7f108b81b3fd041fbba09fb313eccef4bbde980c (patch) | |
| tree | 9519e8bb3ef2f992db905fcc6b303c5038b49f9d /tools/aapt2/java/AnnotationProcessor_test.cpp | |
| parent | 31c5adc27979605740bd4563f5008f340570feab (diff) | |
| parent | e1ae8489705297ed52f48e7c87f0c8cfcc73f2cf (diff) | |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2
am: e1ae848970 -s ours
Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions