| commit | e82d15ef8a08fe6b713ff549c61a20426a92368a | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Apr 08 19:57:44 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 19:57:44 2022 +0000 |
| tree | 447cb915d3ed6b4412575150e6c80b7fb37d2ea7 | |
| parent | 3e95b42bec91de03a5eac58f6ccfeb6225aa2c27 [diff] | |
| parent | ee03d0172da0a9621a207d66cceee52155642909 [diff] |
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150 Change-Id: I3df6bb6584553658ba6df7a16b0f114b674747aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>