tree 569b5593f7017b2c318b7bef969945af33f37fa2
parent 7ef461d2a203b79a768ddc5c292a9b58bf6ee734
parent 77274695a724eefe70c63a5d8bbdf77bd89b748b
author Jim Miller <jaggies@google.com> 1295308422 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295308422 -0800

Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb