OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c724a3 8f5c694)
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)
am: 8f5c694989

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

Change-Id: Ia77ade5bb72dbb3de77a12ca4a6f921b4eb851d8


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help