diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-06-18 10:33:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 10:33:05 -0700 |
| commit | 608601924651531210ad3c6179d02c471f42dddf (patch) | |
| tree | ec1b7516c360292123b2140c0d19a6bc2c68fa11 /api | |
| parent | 772ddc0cf28625964435edc5e86048e353c425fa (diff) | |
| parent | d8bbf96a84cba7c31fa1535fe2467520f2aa0198 (diff) | |
| download | frameworks_base-608601924651531210ad3c6179d02c471f42dddf.zip frameworks_base-608601924651531210ad3c6179d02c471f42dddf.tar.gz frameworks_base-608601924651531210ad3c6179d02c471f42dddf.tar.bz2 | |
am d8bbf96a: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev
* commit 'd8bbf96a84cba7c31fa1535fe2467520f2aa0198':
Fix issue #6664140: Time to lock should work even Stay awake...
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions