commit | 3633a64c88111b340b660064fa9c9536abc2fa96 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Jun 18 01:23:01 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 18 01:23:01 2021 +0000 |
tree | 2b393083d369c0e3d37eca44e936e802c5306b12 | |
parent | 48891ce6dd8bb9e0912f1a08138d06bac95be2e0 [diff] | |
parent | 6a14b5344eba5d8a7c7c1b137d0fa1bc45a7990c [diff] |
[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours am: c8f602d4d0 -s ours am: 6a14b5344e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14974087 Change-Id: I4697b590153258486493ea46ba5cf1a07a3ded67