Victor Chang 6e7c3db5a1 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

2016-04-22 11:15:44 +00:00

..

settings

Merge "Disable trust button when no screenlock is set" into nyc-dev

2016-04-22 11:15:44 +00:00