Merge "Merge tag 'android-6.0.0_r26' into HEAD"
tree: 1f3e8353fae2d2d486ffec4d84705f39e0fe74bf
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml