summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorFlorian Mayer <fmayer@google.com>2021-04-22 15:05:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-22 15:05:17 +0000
commit7e4a0145422aeffa17223669cf7b4458328e464c (patch)
tree91c5e34c4cbfcdaa296a6b2326d50a5bd7c6cfb2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8476c060044bbe99a21a33824797341bdbf858a9 (diff)
parentc60be93eefbcc3fb04dcb9214f443d02170dafa1 (diff)
[automerger skipped] Merge "Revert "API changes as requested by API council."" am: 6b4ecd94c1 am: 5e3ed6416a am: c60be93eef -s ours
am skip reason: skip tag Change-Id Ie465c49ff02065e78a2e8e211a13350a0ff7f0a4 with SHA-1 c89513ac27 is already in history. Skip tag was found from reverted change Ie465c49ff02065e78a2e8e211a13350a0ff7f0a4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683628 Change-Id: Ia88aaa911d641d634a00860f5f172a665ecd3bcb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions