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