commit | 21cea68a243577b647e84d4cbb5ddb2bbddb7eb2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Feb 04 18:19:16 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 04 18:19:16 2021 +0000 |
tree | a4b4d7e0d8e770fe34f97f2de360525225526fa5 | |
parent | 14993282f10f4add8de055f81520311a1990e623 [diff] | |
parent | 0e0360963a384c6bcbe0ae1b4436cde57dff76e7 [diff] |
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -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: Id4a3153c551d622287caed126207c367a8427c0d