am 391e601a: (-s ours) am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev

* commit '391e601ae2d7900ef598eb7d4903bbdde545afb1':
This commit is contained in:
Amith Yamasani
2013-12-05 22:45:22 +00:00
committed by Android Git Automerger

Diff Content Not Available