| commit | b94d36d4c76cbcbaf860b0d25d07c90afb119421 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Fri Oct 23 21:18:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 23 21:18:14 2020 +0000 |
| tree | 34c47b98a761782cfb19938120cb45b3b95ddb8c | |
| parent | 69fefeff6402921f7f95bb450e63a6867d10a092 [diff] | |
| parent | 22244c8ed3961c92ae11e8c0d372230677060e70 [diff] |
[automerger skipped] Merge "Update PhoneStateListener#onOutgoingEmergencySms" am: c5d02da0f6 am: b37753c29a am: 75c5434ddd am: 22244c8ed3 -s ours am skip reason: Change-Id If27771aef1858ea92dd620b56368d1a6a4f61ab3 with SHA-1 4c1e8a2a9e is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470691 Change-Id: I8ee85a67e247f7b2b67bcf1cd484fadb6cca672f