tree 7a6c9ce3aab089e17a9fd4863d70013856fd6e5d
parent 45540e5b26f16b347b94484e150b1994fa11cf2a
parent 81bd8d79cbc87820329f18c7cc4bdd55c36aa6eb
author Suprabh Shukla <suprabh@google.com> 1469754642 +0000
committer android-build-merger <android-build-merger@google.com> 1469754642 +0000

Merge \"Ensuring KeyguardService has the correct user when it starts\" into nyc-mr1-dev
am: 81bd8d79cb

Change-Id: I1683f4bd8f3b4db867f1264d387c4a5c34c8a2ea