OSDN Git Service

Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
authorJeff Brown <jeffbrown@google.com>
Thu, 23 Dec 2010 20:41:59 +0000 (12:41 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Dec 2010 20:41:59 +0000 (12:41 -0800)

Trivial merge