diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-05-17 15:33:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-17 15:33:56 -0700 |
| commit | b12d2084f69773d469f5ec3216806a4c0aaf6483 (patch) | |
| tree | fc2fff186d941d83cc61dfe1e03f30cc1f51f1f5 /docs/html/sdk/api_diff/6/changes | |
| parent | 49cef78d33dfb31c9ac6ab8021d05b7f8b245cd4 (diff) | |
| parent | c1ceb6c614d6489b5152588d1bb41689552d9b8e (diff) | |
am c1ceb6c6: am 00ee1771: Merge "Don\'t allow shortcuts while keyguard showing." into jb-dev
* commit 'c1ceb6c614d6489b5152588d1bb41689552d9b8e':
Don't allow shortcuts while keyguard showing.
Diffstat (limited to 'docs/html/sdk/api_diff/6/changes')
0 files changed, 0 insertions, 0 deletions