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