diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-09-12 15:34:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-12 15:34:43 -0700 |
| commit | 3727f5cf05b3908833c6d021e1f2c303cef310b3 (patch) | |
| tree | 63e5f3f89836566fa7d9fed60de4a008e2948246 /tools/aidl/generate_java.cpp | |
| parent | d381c620ed43c620a7d80e14a0816d641b0a121b (diff) | |
| parent | ac3ef9dbe11090898d8aafec27c536c7934c6f7e (diff) | |
am ac3ef9db: am 9c673b05: Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev
* commit 'ac3ef9dbe11090898d8aafec27c536c7934c6f7e':
Go back to keyguard if user is switched in lock screen
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions