commit | fe8f27e50817f46ac41da052d55fac09245c232a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 14 21:50:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:50:54 2020 +0000 |
tree | 818477d089386f13fd43b46ce1ff34a3fd56a32f | |
parent | 368ae3f9b9e3371a037fd96c88fa42ab682ad034 [diff] | |
parent | 46cde30768c4f16d0e764f2774888ecda57ca53d [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours am: 46cde30768 -s ours am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12579472 Change-Id: Id45eaae95313fb02d2fe6ee17507828a8a9f69d9