commit | 63c3b13f4b245182a6b8469ef517df1eb9528981 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 02 01:59:52 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 01:59:52 2020 +0000 |
tree | 27d8378cdb568e851bc7790007133952fb31309a | |
parent | b08aff561acb5c4d89a0eb35f1216a0e7b0a9947 [diff] | |
parent | 2f964b091f60c783b3fc57e022f9c9d62f09e9a9 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: aee82e345d -s ours am: 2a130094e3 -s ours am: 54651a7cb8 -s ours am: 2f964b091f -s ours am skip reason: Change-Id Iee24bff1511bbf6a3407700147811020cc269c7f with SHA-1 dc9ce0f7b7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/12470222 Change-Id: I6002a74e5990147f8902199d1263ff60cd6c057f