diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-12-02 02:46:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-02 02:46:44 +0000 |
| commit | be7cf4c4ec1eddda80491365485e81eb3e26860c (patch) | |
| tree | 843a2dae9193dd913ed0962da7923a52c9574c83 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f6681eb5d97199a488e7e6d7f2abda4ffa819232 (diff) | |
| parent | 3f665d1778b5f5a00471aca55d3a1aec4fff67cd (diff) | |
Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d am: 697a74cfc5" into nyc-mr2-dev-plus-aosp
am: 3f665d1778 -s ours
Change-Id: I7fcee70fda5479cebc76ea53e86701c8a57782c3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions