| commit | 16b15e9e4fe4cda7b585b5a74e24e800a59bab39 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Apr 08 20:34:06 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 20:34:06 2022 +0000 |
| tree | 447cb915d3ed6b4412575150e6c80b7fb37d2ea7 | |
| parent | fd0e2b04e4c36fe658dc18c5ece5f37f3b031d16 [diff] | |
| parent | 3e95b42bec91de03a5eac58f6ccfeb6225aa2c27 [diff] |
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours am: 3e95b42bec -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150 Change-Id: I1e9ec4c58a6e78a850ebe0138447aa0437385205 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>