diff options
| author | Jim Miller <jaggies@google.com> | 2011-12-05 22:14:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-05 22:14:37 -0800 |
| commit | a3e3c4dd37139615adb88a38e6a99402e0cfcd2b (patch) | |
| tree | 9070696ef70324f861fdb2de6f2a21fd64ced7f0 /tools/aidl/generate_java.cpp | |
| parent | 2eb4a5ee5bebf4120de217adf5a9f72b0c94951b (diff) | |
| parent | 17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc (diff) | |
am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions