summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSooraj Sasindran <sasindran@google.com>2020-07-09 23:29:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-09 23:29:38 +0000
commitd6405c0782c73d20c8433b6fe665fa795baaf501 (patch)
treea498bbfdbd35b3fed1a87c0caa623318a7d8cec5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta9846dcaa5558e9171e3ebce1c27b0a048ba41db (diff)
parent93847d62df9893fd3c91dc0c22fae9ffe08f4f85 (diff)
[automerger skipped] Merge "Add hidden API to support allowed networks reason" am: dc52bd51d8 am: 39877c4321 -s ours am: acb884c5e9 -s ours am: 93847d62df -s ours
am skip reason: Change-Id If4424d7d94ac26ad31725a1658dad5751d0d2629 with SHA-1 7e4cd920e7 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358929 Change-Id: I5cfeaf24f710b4becfe224cd1c5ed8c95e507292
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions