diff options
author | Zoey Chen <zoeychen@google.com> | 2020-09-01 04:15:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-01 04:15:21 +0000 |
commit | 3221c2a1eacdc9a40a61085d66e9d0744a0d2b71 (patch) | |
tree | 7400cbb13dd5b708cc6dca7f76c60c70534eb80c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6066292e9ca024aafde78b03c3802fdbbd4a82fd (diff) | |
parent | 877f8b2af3242ea3856309d23c42686eb00b402a (diff) |
[automerger skipped] Merge "[TelephonyMainline] Make getMergedSubscriberIdsFromGroup as System API and rename it" am: 7c8bda0831 am: b11b8ec3ae -s ours am: 1467af14e2 -s ours am: 877f8b2af3 -s ours
am skip reason: Change-Id I6c077f3bee6bfd4d5b215aca4e9b19b719772b29 with SHA-1 e582f5bc2c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1197840
Change-Id: Ib8c8649498aef92083a2a4524e79d9c434fdee3d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions