summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJordan Liu <jminjie@google.com>2020-12-11 10:57:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-11 10:57:45 +0000
commita07eacba3b56f88f5335f99cf7dfaffe1823425f (patch)
tree888b223665da72bf966cd5e12a84f1cd39dd327f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd25af5c84a29e871581e4c4a57e176fe282342ed (diff)
parentbccf3aa384b3f6a018cf41e2ff2c62ca11fd66bb (diff)
[automerger skipped] Merge "Add API for setting SIM power "synchronously"" am: beb163c655 am: 5a9aa7c8d2 am: bccf3aa384 -s ours
am skip reason: Change-Id I958d6c3a46cc6e99e8addf2628361e37bc178464 with SHA-1 9a081450c2 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522537 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I94877a636d877c05f8798a8ae6d2e57cf06b07a2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions