OSDN Git Service

Merge "User should confirm device lock before un-unifying" into nyc-dev
authorMahaver Chopra <mahaver@google.com>
Mon, 21 Mar 2016 11:17:58 +0000 (11:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Mar 2016 11:17:58 +0000 (11:17 +0000)
commita4474c7286e3b8386589031d2bd6bd6b336db641
tree1d874e37733f9f52bc7b789ec678cdd183179284
parent670a9c7b9820fa7c087a9006c3e5d7ced78b405a
parentad1b7f611310513b7dac74ffaff929c745126f44
Merge "User should confirm device lock before un-unifying" into nyc-dev
am: ad1b7f6

* commit 'ad1b7f611310513b7dac74ffaff929c745126f44':
  User should confirm device lock before un-unifying