summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2021-03-17 22:48:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-17 22:48:20 +0000
commit9daf34be3faead55b151a924450ae70a8b481b00 (patch)
tree1ed740e88bcd9fef383a0a3faf1d50cd82cc6620 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3760e25b303297a5ec8b47691bb79187ff396261 (diff)
parent53942e8692ce05e9ed71aea533d33283b04187b8 (diff)
[automerger skipped] Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" am: 79490a9c00 am: a4c475a6cf am: 53942e8692 -s ours
am skip reason: skip tag Change-Id I3a5afddfc151e06f5deb0220620bbd40849626c4 with SHA-1 923b6d8678 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642444 Change-Id: I149b8b05a988e2ca08bde8bc3969288ff2be1dae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions