summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJack Nudelman <jacknudelman@google.com>2021-04-26 17:35:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-26 17:35:39 +0000
commitb9d126b428a428b874f6c1237f5520b5d252a387 (patch)
tree7e4208bbf8f06922f2fb3860819536f99a21b242 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent181dc2acf032594c36185e6d7e6df974873ffd1b (diff)
parent97882604f2b873fedba302340266a517c733aa90 (diff)
[automerger skipped] Merge "Don't backup/restore sim-settings if Telephony not present." am: d50bb50f91 am: 68e5bb5582 am: 97882604f2 -s ours
am skip reason: skip tag Change-Id Id898d135ed64a704cc4707dcb796664d9b08264b with SHA-1 55fba4d55f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685772 Change-Id: Ic2b923d358fe9f453c1da93dcdc79d892292853c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions