tree f7c507d06596cffdd66158a1a3cbff47a162fefa
parent 9812bc26afc28f1f42f48b6139539c1ac12164f9
parent 000d88df2d3baf31088b789cccadca4d2fb17002
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1553021350 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1553021350 +0000

Merge "Merge "Notify caller when unlockUser() bails out" am: e7df4aa57c am: 030f2bd0ac am: 96fa2e2417"