| commit | 5d7f24255767cbc985198e15d5851088918461d9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:22:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:22:34 2020 +0000 |
| tree | 5ffe8e0db788da2758f1aeb7da1c0340789b2497 | |
| parent | 49936c5eb5019bf96a6e22c64906544904d1b480 [diff] | |
| parent | 48a84d855f7e81f70b02a760f365a96d28d7d645 [diff] |
Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073 Change-Id: I0c107d09b4793a6c16b86a559bebc1a5e92e6e96