diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-05-24 18:29:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 18:29:39 -0700 |
| commit | b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9 (patch) | |
| tree | ccbc439191d9db9cb96d0d1fb4f2648bf87b760d /tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | |
| parent | 731327a93a9e5f1550effaf48fb944d8cae507d5 (diff) | |
| parent | 97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e (diff) | |
am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit '97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e':
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