commit | 2097ca6a738e1f4adc3d085c90b9b100297e865c | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue May 11 07:07:32 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 07:07:32 2021 +0000 |
tree | d7f5dc85a3840b342f29c6c309111d112471997a | |
parent | 628a92c25286ac547388296f68468a537d2cf790 [diff] | |
parent | 8b76d88e55c269350b1b34d1467e234c2c3d746f [diff] |
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 8b76d88e55 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449 Change-Id: I3ca562a87d5c650d7ef347bccb70483f14f05fe6