OSDN Git Service

Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
authorJeff Brown <jeffbrown@google.com>
Thu, 10 Nov 2011 22:40:48 +0000 (14:40 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 10 Nov 2011 22:40:48 +0000 (14:40 -0800)

Trivial merge