| commit | 888c34948c56e1ea0b1e77a2fe0b85edbb58ac20 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:31 2021 +0000 |
| tree | ca4cc6a49eb9249128be18efc844015e79c942f1 | |
| parent | 48674440a6cc255ed8243dccbf37ad6370e7a8d9 [diff] | |
| parent | 84821e5b1c340124c6876e8ad7ca6a17fb87d182 [diff] |
[automerger skipped] Merge Android 12 am: 99f4bd5249 -s ours am: 381fd6a5d4 -s ours am: 84821e5b1c -s ours am skip reason: Merged-In I854661d3c39b306d304c2b74724d802312555bf5 with SHA-1 2d1d1af2c0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1847456 Change-Id: I75aab474b2459e47d92078499924cbcbf079f07e