summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-24 23:39:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 23:39:52 +0000
commitf00f46fce2453e375ae384fcc0ca24f4e9e9fd8d (patch)
tree724d8c5c0bcfb4d68dd16e9a90b989a63762b1f3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentcd385df721c75efbfd56c9dd3da1b74d1000ed45 (diff)
parent813b399eec6b62d5a3285e89eb5304189a996eab (diff)
[automerger skipped] Merge "Identity: Update for changes to ISO 18013-5." into rvc-dev am: f27585e400 -s ours am: b81e6037ac -s ours am: 813b399eec -s ours
am skip reason: Change-Id I380a973a0cc78f1206fd7a33d0bd4896a0b16c6d with SHA-1 4e63378884 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987681 Change-Id: I3677236e65ceebf1e12bd80ab53a1040df1938b2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions