Merge "Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 am: 6e7c3db5a1" into nyc-mr1-dev-plus-aosp

Browse Source

am: 69b034362f

* commit '69b034362f87d390d41c1dcaeb252795468ac184':

Change-Id: If4d099973d8f9de6957057bed66381547f2b3f29

...

This commit is contained in:

Victor Chang

2016-04-22 11:20:17 +00:00

committed by android-build-merger

parent 38360c7752 69b034362f

commit a0b700d8d5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available