| commit | 37d89316169bc4c0c2a8c5a8049477cf6bac3ba9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 09:00:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 09:00:20 2021 +0000 |
| tree | 2b393083d369c0e3d37eca44e936e802c5306b12 | |
| parent | 92485a25ba19beaca2a193b3d9e4fa6351f92c09 [diff] | |
| parent | cd9afb673ed5c672a885221f5d1f95740a96fc6e [diff] |
[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ba3fe43201 -s ours am: b3aa668458 -s ours am: 49668fcb0e -s ours am: cd9afb673e -s ours am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378 Change-Id: Ie098fba96fbe645ed41f187b3b5de1eb46d73b20