OSDN Git Service

am c9f6945f: am be0827dd: am f97ec546: am 2e205e9b: Merge "Settings: Use new PowerMan...
authorJohn Spurlock <jspurlock@google.com>
Tue, 16 Sep 2014 20:31:48 +0000 (20:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 20:31:48 +0000 (20:31 +0000)
* commit 'c9f6945fc80511de36c6e7029b49a0d322b9aaa5':


Trivial merge