summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2018-10-11 22:20:54 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-11 22:20:54 -0700
commit58d1ac473e0cd87886fe8ed666b6245097729927 (patch)
tree18b2238fa498a69a887d3cede1b35c2188d6ab4b /tools/aapt2/java/JavaClassGenerator.cpp
parentf85bd2b22d7197397449d5657d67d7ac8a2cc1dd (diff)
parent7656e1177feaff4a118f2d36f329d0cbaa5b3340 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b
am: 7656e1177f -s ours Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions