commit | 46cde30768c4f16d0e764f2774888ecda57ca53d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 14 21:18:52 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:18:52 2020 +0000 |
tree | 78d37d6c63eabbef05e3e53e45b664e67254475a | |
parent | 91286c4ec9bae9bd889d80fb26252345daea8609 [diff] | |
parent | c9fae4d80e26185422009f9c8b99092850440a45 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -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: Icfb9e9a3074558ecbfb6f2a41c8b0cf0da133dc5