diff options
author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 01:05:28 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 01:05:28 +0000 |
commit | 7cd3c47c2900f1c6a7c16c257ce628940fe6eb48 (patch) | |
tree | a246c27eda434542bd8c1c0f6023994441a739f9 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | d2a9d6fa27292e7c87afb0d48644333b418a342e (diff) | |
parent | bafa3c1d3b436fdaa31dabaeb49bc0d9b125c887 (diff) |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours
am: bafa3c1d3b
Change-Id: Ifacdf34a063571d521dc635003ddabb3228460d4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions