diff options
| author | Amith Yamasani <yamasani@google.com> | 2017-02-14 01:12:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-14 01:12:55 +0000 |
| commit | 985fefd01201fceaf0655e2173b6e4ad0513fdd6 (patch) | |
| tree | 0075f444816505ba2f23e97220c119c0ea78ecaa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 69c26226e13e10abd350c298be05b6b8283b79d6 (diff) | |
| parent | 669d6694e1ea5e5892ef2db87dbede2ecd3b8903 (diff) | |
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: 67dbaa8a14
am: 669d6694e1 -s ours
Change-Id: I29ab0714044a68b1faac50ae12398bf86bfd3a88
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions