tree b4b27b888bd2b25366cb2d9d1eb8767f1de56030
parent b220d235295c9e9f1e61b962119ef04615171816
parent 54a514eda04fe8765ab3e93e5b84b790e21cf179
author Rubin Xu <rubinxu@google.com> 1525882825 -0700
committer android-build-merger <android-build-merger@google.com> 1525882825 -0700

Merge "Allow profile owner to disable iris/face on personal keyguard" into pi-dev
am: 54a514eda0

Change-Id: I8516f3ffa4c655195da3863d6ac23ab52af4ef70