diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-08 05:28:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-08 05:28:40 +0000 |
| commit | 4478d19f5f9e59e62de4d24835dfdf2b89b7e4bd (patch) | |
| tree | 5c4990d10db409cd2029866dabee25981afe66f0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 93344fe4bd75ba91eb768052a5067bc18583e1af (diff) | |
| parent | c8f4ac6679d9346cd34fb18caf7c4ff39a23a56b (diff) | |
[automerger skipped] Merge "[Settings] To avoid use APIs in IccCard directly, moving APIs into TelephonyManager." am: e6d7525805 am: 3f04483102 am: c8f4ac6679 -s ours
am skip reason: Change-Id I1a3c3b15063ea00d0ca59bd5395f2bca8cdfe391 with SHA-1 16a1821f9c is in history
Change-Id: I4ad71e96085f8413368e551de081f5fdb931f6be
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions