commit | df427d2297b3ce6124cccdaac6989bdbffc477cc | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 17 19:46:56 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 19:46:56 2021 +0000 |
tree | c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41 | |
parent | f36a184648f7588f2ce4a650789287f0adc9685c [diff] | |
parent | 883e10b6eb4fbb1bbce51fda70d053ebf11a78d1 [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a1de4c6517 -s ours am: 883e10b6eb -s ours am skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807 Change-Id: Ic4878c98a53221989c4d7bcdaf4bbdcfc780cfa8