commit | 18a68878119ea72d59c5b283abcbe4c04239e6b0 | [log] [tgz] |
---|---|---|
author | SongFerng Wang <songferngwang@google.com> | Thu Mar 04 14:48:19 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 04 14:48:19 2021 +0000 |
tree | f9b714929de8943a6af0bfec4509d178a524f384 | |
parent | 351a28418cdd8e1e8d9b5248ebd575ca10f5a2c2 [diff] | |
parent | 1cb02f5e0d36c3e9ea94fe74e8398a2fff29e7c0 [diff] |
[automerger skipped] Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8 am: 1cb02f5e0d -s ours am skip reason: Change-Id Ia99a4cf4618fcb32162485e7da5e48e3b313ce67 with SHA-1 216b346438 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iec2ac0ac303394d15d5540c6050ea9ecc989e3ff