OSDN Git Service

Merge "Disable trust button when no screenlock is set" into nyc-dev
authorVictor Chang <vichang@google.com>
Fri, 22 Apr 2016 11:15:44 +0000 (11:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 11:15:44 +0000 (11:15 +0000)
commit6e7c3db5a1ad0084fb086a4728ba1ddadb3d8ee9
tree26849d5812b90f557ad8bfaf6a9380fab54354cb
parent4c724a3e484e46004caee359c4fd4153f1aa5e84
parent8f5c6949894ac0ccafa7371b4bb872abbfe41de9
Merge "Disable trust button when no screenlock is set" into nyc-dev
am: 8f5c694989

* commit '8f5c6949894ac0ccafa7371b4bb872abbfe41de9':
  Disable trust button when no screenlock is set

Change-Id: Ia77ade5bb72dbb3de77a12ca4a6f921b4eb851d8