diff options
| author | Jason Monk <jmonk@google.com> | 2014-12-11 01:38:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 01:38:16 +0000 |
| commit | ccec890f494aa4da7498979c9751fad51f75b685 (patch) | |
| tree | 2472b47fdd8fd947e67965fea63cf396c12a1873 /docs/html/sdk/api_diff/18/changes | |
| parent | e2831a181f14dd6ca0e601a4c3cdc313a58faaae (diff) | |
| parent | 3b4ccabc06578a70adb2c0c748ded0410b26a763 (diff) | |
am 3b4ccabc: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev automerge: 65c08ec
* commit '3b4ccabc06578a70adb2c0c748ded0410b26a763':
Handle policy change while keyguard disabled
Diffstat (limited to 'docs/html/sdk/api_diff/18/changes')
0 files changed, 0 insertions, 0 deletions