| commit | 54651a7cb8af1df6a0df35d4a43952f1ebac256e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 21:47:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:47:11 2020 +0000 |
| tree | 27d8378cdb568e851bc7790007133952fb31309a | |
| parent | 90caf11575f02672864a881e0b5d19c1d9ccc4c7 [diff] | |
| parent | 2a130094e32b72e5f9eb76f9669b2caa04323067 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: aee82e345d -s ours am: 2a130094e3 -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: I80565a440d3c9a2bea911c51798c1e01367b621e