diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:30:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:30:04 +0000 |
| commit | 4b0164b27cc9e891f7a4b6d2b2c624600ac697bc (patch) | |
| tree | 240c97834972776aa566aaf720abf598a8500492 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9346bec730b332c0283a6641f6691897c80e884b (diff) | |
| parent | d20b04a41db9a514b3eab8f3654f95707645ffc5 (diff) | |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d
am: d20b04a41d -s ours
Change-Id: I2a98850d4c3246c02d5197adff9503be2839df01
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions