Android 6.0.0 release 3
am 9b6836aa: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '9b6836aabee945b6c7a54796a4e6a7ae735f423c':
  Remove deprecated locales - DO NOT MERGE
tree: cf68ccbb40d697f20db4d6994ef2fe102a25ac8c
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk