tree 8d11e9caef36b10b0cbc536dc7fb0abcb8fde857
parent e56af07775dc3b441f84dfc55103774eda679704
parent ece60739aa96c8f8eb7f8dd75ef0d9b4ee2ac72e
author Rubin Xu <rubinxu@google.com> 1523916814 -0700
committer android-build-merger <android-build-merger@google.com> 1523916814 -0700

Merge "Remove unnecessary disk access when loading synthetic password states" into pi-dev
am: ece60739aa

Change-Id: Ic443dc0cb20282a89a274835375037689ab6d8f4