diff options
author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:32:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:32:57 +0000 |
commit | f68199a4721e92a066fb2f671311731d0f65e35e (patch) | |
tree | 3d82a5c37f20684a796e0128e6dab1093f7089ef /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 09d230d47346e20904dd4a3022264d5f5187e5d8 (diff) | |
parent | 8469d52d41f2b5dd48833a0cb83c087cd00ea6e2 (diff) |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223
am: 8469d52d41 -s ours
Change-Id: Ib3b38a9c4dacf09aeec385e46b464598c0214a76
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions