OSDN Git Service

Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev
authorDianne Hackborn <hackbod@google.com>
Sat, 16 Jun 2012 00:23:55 +0000 (17:23 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 16 Jun 2012 00:23:55 +0000 (17:23 -0700)
commited99a81e1595c25d7070866ee0c2aa1d94103955
tree6bd073acf535e72dfd0c60651c2610f4c7057bfe
parent9d6d89ef82f07ef54238699619d4875c4f2ae833
parentf34a8d75177f52bffeceaf308b65860015b45d5e
Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev