summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-06-23 18:34:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 18:34:57 +0000
commit85bc5df058167980ec381689235ada940e952528 (patch)
treea34ceda6fdbc602f446666f19dc10876b58599e1 /tools/aapt2/java/JavaClassGenerator.cpp
parent91390fe5b4d99a980a85f4deaa018ba457c09f93 (diff)
parentaf15627d355a3b12811f5cce4a216fd3634f0144 (diff)
[automerger skipped] Merge "Add a carrier config for WFC's carrier name override by ef_pnn" am: 44d15f6905 am: 7b3426f5f4 -s ours am: 07da09c42e -s ours am: af15627d35 -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: I79fa79d63e2f5ef2ee11a3a4bc19bf45b223e4ae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions