Merge "OG: battery style: hide "expanded" for now" into android-7.0
tree: 82561ec8b8e145578d581e3bc053e763378da7ae
  1. res/
  2. src/
  3. Android.mk