summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2018-10-11 22:56:08 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-11 22:56:08 -0700
commita305fbf85ec2c66942777034296378fcf06f0c83 (patch)
tree01f5479438fabf7501cb5f4526dc669b9000196f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent607cdde9ae564b2f20294e630086c5073a9962b6 (diff)
parent58d1ac473e0cd87886fe8ed666b6245097729927 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b am: 7656e1177f -s ours
am: 58d1ac473e Change-Id: Ibd2f4fcb800b7a48e7b9313083c88b4441d02f7c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions