tree 30b1a5497f4f7f609705fc5541e311064996767f
parent 63cb0fbf07322b715521e8127217ee2c80cd3020
parent 8d5ab52c6c9a5987bc1cd1fcc000a458ba619acb
author Ricky Wai <rickywai@google.com> 1464182120 +0000
committer android-build-merger <android-build-merger@google.com> 1464182120 +0000

Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4
am: 8d5ab52c6c

* commit '8d5ab52c6c9a5987bc1cd1fcc000a458ba619acb':
  Do not tie managed profile synchronously in onUnlockUser()

Change-Id: I5e2bb7364c957b41deb9389d0ee75efe68a8bc0b