| commit | 30a9090c7c22c30341c96198354ec201c37ada4a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 21 16:14:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 16:14:43 2021 +0000 |
| tree | c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41 | |
| parent | 8749a3714ca8177f3b23c8ae33beecd8a0d22959 [diff] | |
| parent | f36a184648f7588f2ce4a650789287f0adc9685c [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: c08addd878 -s ours am: 5ef5b9278f -s ours am: f36a184648 -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: Ibfba967ae1dd7d17fad2f843c20679169b010d17