diff options
author | Jim Miller <jaggies@google.com> | 2012-01-20 15:48:21 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-20 15:48:21 -0800 |
commit | d3fe9abfb9a6a21a18abde6a98dceb423c04ebef (patch) | |
tree | 35cadfcae72edfa6d0bff057bfd84a2e60857edd /tools/aidl/generate_java.cpp | |
parent | 865534a0e30982b0e669006509b9590fad129295 (diff) | |
parent | ab9601cdbb95ae94088750eff9a926a572c1a4d6 (diff) |
am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1
* commit 'ab9601cdbb95ae94088750eff9a926a572c1a4d6':
Fix 5863053: Add method to lock screen immediately.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions