summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-06-23 18:11:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 18:11:44 +0000
commit07da09c42e04efb1d1af21bd36b527231a562a39 (patch)
treeabda1544041e091029c5fc06cdf4c485aef40428 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1b90a57ee444b88770003b30ca869e60712554aa (diff)
parent7b3426f5f44399b1ac17e4d70e558e6f86dc8040 (diff)
[automerger skipped] Merge "Add a carrier config for WFC's carrier name override by ef_pnn" am: 44d15f6905 am: 7b3426f5f4 -s ours
am skip reason: Change-Id Id72ce2a9a0fb8f45efa8a975e8052808f726a971 with SHA-1 d1b164401e is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347352 Change-Id: Ieb2b692d1c017a392c901d734f462002bb19bc14
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions