Merge "OmniGears: [2/2] Battery styles are back" into android-7.0
tree: 47410abde0074ab0918723ee4d937b6f7b0d4d1a
  1. res/
  2. src/
  3. Android.mk