summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2018-10-11 21:56:21 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-11 21:56:21 -0700
commit893598cd4ba738d916bc1b5dce303a166566f37b (patch)
tree2d7faf2544bf8bb4a09d4323f770d9a766ef16e1 /tools/aapt2/java/JavaClassGenerator.cpp
parent80c65f6ce7e6eace5dd54df729bd2f426343152e (diff)
parentab80221a8cf0e2f2575b72b502de3d7594cb1a22 (diff)
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am: ab80221a8c Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions