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)

Trivial merge