| commit | d0a6af929c15c33e3da363d5a4f41191827f4168 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:29 2020 +0000 |
| tree | 27d8378cdb568e851bc7790007133952fb31309a | |
| parent | 2f964b091f60c783b3fc57e022f9c9d62f09e9a9 [diff] | |
| parent | d0d3f453050af6519b9865295194b4e1c0f2d11e [diff] |
[automerger skipped] Merge "Merge Android R" am: 7ea932074b -s ours am: 77fa0e89df -s ours am: 1472941a27 -s ours am: d0d3f45305 -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: I65091f0802f32d02542975264aecf502eae32ef0