commit | 9ebe07d21650ea0714df2800962dd59255be9c96 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue May 11 06:41:09 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 06:41:09 2021 +0000 |
tree | 1027f8ffeeee4a886e6ba5b657d6c85ff94cd91a | |
parent | e90fdbf747b0261576b45591116d8ae24bf487fb [diff] | |
parent | 045aa65893ad6d9b567391467266b136accb30d6 [diff] |
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449 Change-Id: I338cea4bb8314f2490ef37b982d82c4f7f4e35ba