| commit | 73596ad66b2535c12009a536630e4af8334f7d64 | [log] [tgz] |
|---|---|---|
| author | Chi Zhang <czhangsd@google.com> | Wed Oct 20 23:17:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 20 23:17:55 2021 +0000 |
| tree | 58fe76641a07b626124a81aaa23eccb7cb472af6 | |
| parent | 209e2d09f20a821ce01da2fc9999ecda4d3a155b [diff] | |
| parent | ca8bbf2570e1b1e3a64da381ab67800e8a2d8dec [diff] |
[automerger skipped] Merge changes I18db3355,I5328b68c into sc-v2-dev am: a98ebe8bb4 -s ours am: ca8bbf2570 -s ours am skip reason: Merged-In I18db33558de94485497c6d75add60796b6b8eb79 with SHA-1 69e548b0a2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/16040583 Change-Id: I9dca4213bff71d05f10f3cb7eb587d273b2f17bb