summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-13 13:33:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-13 13:33:08 +0000
commit519a5eb4dbbd57e65efa1d6566a2be763b587376 (patch)
treeb899e8e9c11e2e81c09c639c1594fec63140cb48 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent90c697776b402a752e92e2fc631a337c9650ef6e (diff)
parent627480d9188a77047265106b3441061b73eeb181 (diff)
[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 70a89435e7 am: 4220fc33a1 am: 627480d918 -s ours
am skip reason: Change-Id I41e12e425284e74561c6b61663241df364ae54a1 with SHA-1 ed5a6ae7ae is in history Change-Id: Ideb577455679c226bc42eb5c47ed9a4d92329931
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions