diff options
author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:10:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:10:17 +0000 |
commit | b058dc139dcea65def3d8c842aa37ea5dc2695a8 (patch) | |
tree | 866bd200024decd6c9f5b9717493991a0ed3c2cd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4a4b6bfafbf024c27590533d7d0501ede2c47598 (diff) | |
parent | 3e4faac39f77e3ad86cdca528d8981cb0c00daa0 (diff) |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
am: 3e4faac39f -s ours
Change-Id: If1ea6da6679874ca13379222a28c529421c80b23
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions