commit | 573a375a5a3b051fc8c4b9d65c67f5827f72c33b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Feb 04 18:40:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 04 18:40:34 2021 +0000 |
tree | f5fe7e304ceebcd5ceeddee484355fbab9e71a89 | |
parent | 93726f4de6d3f88c89cdbb8cd5d61eaf6d0f9ed5 [diff] | |
parent | 21cea68a243577b647e84d4cbb5ddb2bbddb7eb2 [diff] |
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours am: 21cea68a24 -s ours am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1573546 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97e093144665318f408cf8031422b8b0ab06101a