OSDN Git Service

Merge "Only ask for credentials in add account if user is locked." into nyc-dev am...
authorNicolas Prévot <nprevot@google.com>
Wed, 4 May 2016 13:05:24 +0000 (13:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 13:05:24 +0000 (13:05 +0000)
commitd9699c254ddffbf5f396fbc7f9506c541c7ae495
tree1b419518b45e604a0ed303c304f3e3e691262cdc
parentdc47ac730ec5489989f922b9a8c9cdd2d452a9d1
parent0eab3652891460e3c4ce3582a14f682e5759fb55
Merge "Only ask for credentials in add account if user is locked." into nyc-dev am: 832c8e4fda
am: 0eab365289

* commit '0eab3652891460e3c4ce3582a14f682e5759fb55':

Change-Id: I84b70273827460caf65d04759eb06cf624579f1c