diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-05-24 18:34:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 18:34:07 -0700 |
| commit | 3266873f7fa9941ba1bc09f878b974b182e85ae4 (patch) | |
| tree | 7dfdad93dbc1448a7a07e4aafc4a594dec138116 /tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | |
| parent | aa4aacad9fe73b48f9698d56f4e1d0c8fe277a96 (diff) | |
| parent | b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9 (diff) | |
am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit 'b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9':
Unhide KeyguardManager locked and secure state getters
Diffstat (limited to 'tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java')
0 files changed, 0 insertions, 0 deletions