diff options
| author | Daniel Bright <dbright@google.com> | 2021-01-21 06:22:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 06:22:27 +0000 |
| commit | 72b973ba19200961beec8d744e1586c5631d2810 (patch) | |
| tree | 20ffe2e832b74f29d6a91133b617ec770a88f61a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 907c3f164ff9d0da884d597b34acaaf5d1ae224f (diff) | |
| parent | f95800d6ba5787d7c998e19ef35b7ae7a0bfb67f (diff) | |
Merge "Make TelephonyManager#setImsRegistrationState multi-sim aware" am: 2c8f0de95c am: 7c2815e531 am: f95800d6ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6b71a7d1779a7f8fa47150be0a8f2549188d61df
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions