summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2017-02-14 01:13:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-14 01:13:53 +0000
commitb916301d8029fe67155401b505b01d893db3931e (patch)
tree0075f444816505ba2f23e97220c119c0ea78ecaa /tools/aapt2/java/JavaClassGenerator_test.cpp
parent985fefd01201fceaf0655e2173b6e4ad0513fdd6 (diff)
parentb8aac6758bae0f2f61e60006f9e53b3a5a4283bd (diff)
Merge "Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: ee37330dff" into nyc-mr2-dev-plus-aosp
am: b8aac6758b -s ours Change-Id: I0c9b341f62533e895c104c2f14ed911476b58eef
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions