am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev

Browse Source

* commit 'd04e36e6f2259747dac4c4a1fa0393f72dc078af':

...

This commit is contained in:

Amith Yamasani

2013-12-05 19:37:05 +00:00

committed by Android Git Automerger

parent 962c7f874a d04e36e6f2

commit 391e601ae2

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