commit | c56d0141a8a6b24e6781da48a5fcdcf706b53865 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 15:56:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 15:56:51 2020 +0000 |
tree | 7d4d6ba3dee0f4aaa9b30e5c542526eb34771aa3 | |
parent | 8c4f391b0be46a4b1b688c087ad6b17d48f40281 [diff] | |
parent | 9d0f1c35dfa4b56d7a74dc8748790205f58626bc [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 9d0f1c35df -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: I7457d92d8215b53c6da6aba234489a10c3349a01