| commit | afad476dc56a815cdc4a4a7cd53ef3afcfdfdc6e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 21 17:23:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 17:23:03 2021 +0000 |
| tree | 2b393083d369c0e3d37eca44e936e802c5306b12 | |
| parent | e600f4d47c2a56538002a317ddee11812ac61a0c [diff] | |
| parent | 30a9090c7c22c30341c96198354ec201c37ada4a [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: c08addd878 -s ours am: 5ef5b9278f -s ours am: f36a184648 -s ours am: 30a9090c7c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481 Change-Id: I851f8043806e5a151703a1e7acda9007bf0d866f