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