OSDN Git Service

Merge "Do not update unified setting before updating primary profile lock" into nyc...
authorRicky Wai <rickywai@google.com>
Tue, 12 Apr 2016 17:16:23 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Apr 2016 17:16:23 +0000 (17:16 +0000)
commit3d4f71ec99afa14037326328f5052b4db6f702b5
treecfb85d683518a3e3d779e261d2c65eedf795c6f3
parente247608846c9ceec352785e35e75a693ba56e1e0
parent16d93fbae43639ae421045b4fcbcc650fec02865
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev am: 8e91558
am: 16d93fb

* commit '16d93fbae43639ae421045b4fcbcc650fec02865':
  Do not update unified setting before updating primary profile lock

Change-Id: I99b287d03411311d807d739e529813d80dd82adc