OSDN Git Service

am 94b75858: (-s ours) am 50972605: Merge "Disable ignore battery optimization items...
authorJason Monk <jmonk@google.com>
Thu, 27 Aug 2015 11:32:42 +0000 (11:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:32:42 +0000 (11:32 +0000)
commitc4865d16e9e0b55df2a071f0f106f82ce012ce31
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent31cb2f6c01cd414463c2a1c0ca0d28d78af86e0d
parent94b7585895751cd4db313ffa708fdff01f34b0d9
am 94b75858: (-s ours) am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev

* commit '94b7585895751cd4db313ffa708fdff01f34b0d9':