Merge "[DO NOT MERGE] Rollup changes from R"
tree: 5a1a436f9024c5d97b63a761e33f0309c476d336
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS