| commit | 762d039b477d6c271cd99e70d54c5df911f2eb91 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:27:03 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:27:03 2020 +0000 |
| tree | b873293adb7c660f4c6cd966a738b66db782d55e | |
| parent | 37cfec7ac2f0fc0f6dceadc020cd4f1b18a168b9 [diff] | |
| parent | bd90a0d0ffa864d6b58a279d01b28fd7ffc3e958 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours am: d50cfa9b63 -s ours am: 5ff5b3187c -s ours am: bd90a0d0ff -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073 Change-Id: I7b35900c07fa69407ec5bfa073a105db07e1d0a3