Merge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
am: 30b97e89d4" into oc-mr1-dev-plus-aosp
am: 280c7976e7
Change-Id: I4904a1db6b774acf447f1f1acd0f5c06b186c8cc
This commit is contained in: