diff options
| author | Peter Wang <tpwang@google.com> | 2020-07-31 09:04:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 09:04:43 +0000 |
| commit | 4b6112a42c27744e758d458feec276604f0c5219 (patch) | |
| tree | f9ec147ad73a51c8934bfdee7949a21f23173dca /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 7b7055970a7e2754018c50eff90dfd515772464b (diff) | |
| parent | 8ba18c0508e809cfe6fde90a60bda357b244cb49 (diff) | |
Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: I43a19b479d4c77bb19af31381e7d998527bc068a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions