commit | ff7a4802587306448d81cb618ea01e25050bcf46 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat May 22 05:00:52 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 22 05:00:52 2021 +0000 |
tree | 46b39082e6348af482cee79e97679d85e09d3f5a | |
parent | aa081790409e7fba3124ae897de73370ccb35514 [diff] | |
parent | 08bbc34bbe925cf41cd21fe7b379bb1e65a3ccd3 [diff] |
[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe -s ours am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 bc66712394 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293 Change-Id: I3672d2fe9420368e76ce7e724b7d9c2b7ac26660