Commits
Dianne Hackborn authored and Android Git Automerger committed 7a9a1140220M
am 10faec4b: (-s ours) am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev * commit '10faec4bc054536b4cce7c8cbc8faa367c397efe':
Showing diff to10faec4bc05