OSDN Git Service

am 7bdf0e73: Move sleep policy to main settings page
authorIrfan Sheriff <isheriff@google.com>
Sat, 29 Jan 2011 01:30:59 +0000 (17:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 01:30:59 +0000 (17:30 -0800)
* commit '7bdf0e73d051f176fbc20451761eb50177d69f91':
  Move sleep policy to main settings page


Trivial merge