| commit | f36a184648f7588f2ce4a650789287f0adc9685c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 21 06:42:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 06:42:54 2021 +0000 |
| tree | c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41 | |
| parent | 3e6f48b1db6c4739cfdd100584764a50462c0cf9 [diff] | |
| parent | 5ef5b9278f5647108a4b127a3da8f18d05a4dd21 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: c08addd878 -s ours am: 5ef5b9278f -s ours am skip reason: Merged-In Ia8161dc461f79edacbc59a3b0e09323d1d4508c7 with SHA-1 c21e847348 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481 Change-Id: Ida30b3f19b975f65b66ef39540dd45c460911b53