summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorZach Johnson <zachoverflow@google.com>2020-05-27 04:30:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-27 04:30:44 +0000
commit7152141efce1aa1e59cb52c01a3b04c432ccb3d0 (patch)
tree69401eebc96c421994344a0f84925b95d4292e85 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent04110eb47716a668cafc19cf2669a6f7faa67ebc (diff)
parentbdd720e4f45c881cb77d88d729fb9c1b2f0255f4 (diff)
[automerger skipped] Merge "Add NAMESPACE_BLUETOOTH for bluetooth feature experiments" am: 6a67acaaf3 am: 24f591c22d -s ours am: bdd720e4f4 -s ours
am skip reason: Change-Id I330b8cc5aeb14ebcc15fb88c605ac72770497040 with SHA-1 1eec532a8e is in history Change-Id: I907b16eb3c44fada43ee2ff7947af59f1ef6a215
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions