OSDN Git Service

am 3a9537c7: am 97bb9d05: (-s ours) am fc28d6fc: Merge "BatteryStats: Prevent Battery...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 27 Aug 2015 18:37:08 +0000 (18:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:37:08 +0000 (18:37 +0000)
commit663ae49d74866d1be153bc403293c7e57f1b4256
treedac0c3e7fb56a41aecac39e4e0713ea791d15008
parent5f581e35df9e74056c4bbfe07513bd2675891e73
parent3a9537c75fa14c7447560e892169a777d4931875
am 3a9537c7: am 97bb9d05: (-s ours) am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev

* commit '3a9537c75fa14c7447560e892169a777d4931875':