diff options
author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:12:19 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:12:19 +0000 |
commit | 5536402f6dcda352a44c946fb0993eb7f8bccd80 (patch) | |
tree | a246c27eda434542bd8c1c0f6023994441a739f9 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | d819c2386be5cef236e669beef29989b1e4324dc (diff) | |
parent | 0354b89d31a5bb083e47c0fa56ea4443cffffa35 (diff) |
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
am: 0354b89d31
Change-Id: I186f3fc1530e8a554916f83bf8e9fb98adceb507
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions