OSDN Git Service

Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev
authorRubin Xu <rubinxu@google.com>
Wed, 24 Aug 2016 14:28:59 +0000 (14:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 14:28:59 +0000 (14:28 +0000)
commit50c5f4ac38471a8b07bd2ca0eaa1433d4af86426
tree8720051c36bb88ea8068823ab10bb0bd6ff9bf12
parent6b3c49d2b8b3ea2c22d17e74c2f311d3e172bbed
parent4d826638ab1ba3f90a67d0cf4d9256d4e88ee002
Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev
am: 4d826638ab

Change-Id: If6fa13004de30cef2c528a5fcdc460ff39f850cc