commit | dc9ce0f7b71c01c8f3dfa31209d200efeb7d620d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 16:08:06 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:08:06 2020 +0000 |
tree | 0b0da8be4248bd04ec2fe56615164978ec9596ef | |
parent | e0fa60c0112065daf96bc71571a98ba2c2109ba0 [diff] | |
parent | c56d0141a8a6b24e6781da48a5fcdcf706b53865 [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 9d0f1c35df -s ours am: c56d0141a8 -s ours am skip reason: Change-Id I69b76603053fa88c407d2401a9738cac216432e4 with SHA-1 8c4f391b0b is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1323222 Change-Id: Iee24bff1511bbf6a3407700147811020cc269c7f