tree f6d0ce3f982bfed14da75a705b61f6287a885067
parent 6bbf3804eee20edb87ef69a68781ab85cde1f1af
parent 6154a49b2821e55cff4ef5f06fbd36320d79a32a
author TreeHugger Robot <treehugger-gerrit@google.com> 1602158220 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602158220 +0000

Merge "Do not re-initialize synthetic password" into rvc-dev am: 5ad4ec37a0 am: b00cccb819 am: 6154a49b28

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12653063

Change-Id: I81e549099441edf3d3394436808af7de6aa8267a