diff options
| author | Jim Miller <jaggies@google.com> | 2012-09-11 14:01:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-11 14:01:48 -0700 |
| commit | 57db8bc4257ba05f0996490b90a57705d6ef0e6c (patch) | |
| tree | acf26083963bec8102785982d70544af442efbaa /tools/aidl/generate_java.cpp | |
| parent | d94fc289f5a4eb938db9331fc8ed9e9f9c669255 (diff) | |
| parent | 752ef4e0f86fa1412488b6c03ff4ae8a22f0e307 (diff) | |
am 752ef4e0: Merge "This enables the back button in keyguard" into jb-mr1-dev
* commit '752ef4e0f86fa1412488b6c03ff4ae8a22f0e307':
This enables the back button in keyguard
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions