OSDN Git Service

am eddcd118: Merge "Prevent monkey from turning off the screen." into honeycomb
authorJeff Brown <jeffbrown@google.com>
Thu, 20 Jan 2011 03:59:04 +0000 (19:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Jan 2011 03:59:04 +0000 (19:59 -0800)
* commit 'eddcd1186b05b9b425ae765e98882a1815e3ac4d':
  Prevent monkey from turning off the screen.


Trivial merge