OSDN Git Service

am 9d5907d0: (-s ours) am 08cb3983: Merge "Update battery optimization strings" into...
authorJason Monk <jmonk@google.com>
Thu, 27 Aug 2015 11:34:03 +0000 (11:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:34:03 +0000 (11:34 +0000)
* commit '9d5907d03edfec6a2823f908cade6c458644da0b':


Trivial merge