OSDN Git Service

am 10faec4b: (-s ours) am f0e5501e: Merge "Fix issue #22989030: Separate battery...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 10:11:48 +0000 (10:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:11:48 +0000 (10:11 +0000)
commit7a9a1140220a692a37039c76fd227ebbf21e65aa
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent5f02146c82c57ba85d7d900fe0e28d0aa8f910c4
parent10faec4bc054536b4cce7c8cbc8faa367c397efe
am 10faec4b: (-s ours) am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev

* commit '10faec4bc054536b4cce7c8cbc8faa367c397efe':