diff options
| author | Peter Wang <tpwang@google.com> | 2020-07-31 09:34:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 09:34:47 +0000 |
| commit | 68aed47728931e1d399e84992c8f158703a113ea (patch) | |
| tree | ad16666027b863be3464bdaffb4460b538aacd7e /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 923785767900e4837c693a441de75293586f0316 (diff) | |
| parent | 4b6112a42c27744e758d458feec276604f0c5219 (diff) | |
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508 am: 4b6112a42c -s ours
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: I1e06f6cdb0e69e06cf94a543eec83478dabeda14
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions