am f8c4c3c7: am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev

Browse Source

* commit 'f8c4c3c765ca5d4faa4aed6940e5a26c9c7f1d44':
  Show the keyguard if unsecure window on top. DO NOT MERGE.

...

This commit is contained in:

Craig Mautner

2014-03-08 02:09:30 +00:00

committed by Android Git Automerger

parent 199670c46a f8c4c3c765

commit 889f705df3

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