| commit | 77fa0e89df2b9a3b6770b6eeb73f64062dea6ad8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 00:41:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:41:00 2020 +0000 |
| tree | 27d8378cdb568e851bc7790007133952fb31309a | |
| parent | aee82e345d060cac6439991cce02292a8ffeba0f [diff] | |
| parent | 7ea932074b538ce4e3d6578233f9cbf9ebfdbfc5 [diff] |
[automerger skipped] Merge "Merge Android R" am: 7ea932074b -s ours am skip reason: Change-Id I02ad49d6b2c3344b90108ee0933a82bd2244dfd8 with SHA-1 aee82e345d is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1421777 Change-Id: I61fd56bb5b7423bde6ba6d98c88505ca13999e15