diff options
| author | Jim Miller <jaggies@google.com> | 2012-01-18 16:46:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-18 16:46:12 -0800 |
| commit | ab9601cdbb95ae94088750eff9a926a572c1a4d6 (patch) | |
| tree | 0d0cd7a4c684baadddce9bed8685776f79829241 /tools/aidl/generate_java.cpp | |
| parent | 05683c85965b880d634177c789451dd044fcbd6f (diff) | |
| parent | 230a709285abc5dfd92f05d91a8997d52a59d3c7 (diff) | |
am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1
* commit '230a709285abc5dfd92f05d91a8997d52a59d3c7':
Fix 5863053: Add method to lock screen immediately.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions