| commit | 5ef5b9278f5647108a4b127a3da8f18d05a4dd21 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 21 06:11:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 06:11:02 2021 +0000 |
| tree | 5c451e38e1adb035eb12ef2c6d5115e7b2636527 | |
| parent | c21e84734803d4e6b103d6f79c6e5e5fa353d4f8 [diff] | |
| parent | c08addd87806e322a93a9d5edfea9dc495e6beba [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: c08addd878 -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: Ie980435af6796a0e9045e4755e601ea67865bd69