| commit | d33b36e39898ce6f0d4d53418cedd5186b4db7b3 | [log] [tgz] |
|---|---|---|
| author | Aaron Liu <aaronjli@google.com> | Thu Apr 20 18:26:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 20 18:26:51 2023 +0000 |
| tree | 61b19ba494a32fdbce9dd51d624d10e0fc9a1e91 | |
| parent | c56071bc071d546dd0445242674c153874ae0eb4 [diff] | |
| parent | 343d95beb67d8d18df1f304011300d2af6873437 [diff] |
[automerger skipped] Merge changes from topic "cherrypicker-L22000000959901080:N28400001357657640" into sc-qpr1-dev am: 7fdc711ced am: cf8dcd2832 am: f2e055c735 am: 406e60c8bd am: 3df4f88366 am: df75c62f92 -s ours am: 343d95beb6 -s ours am skip reason: Merged-In Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4 with SHA-1 48fa9bef34 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621774 Change-Id: Id3976ccfc97871a59453b13112f4c4250f29e651 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>