Merge commit 'e0e5383c8c612f98428b99edb0646331ed27e09e' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ied1988d8170870871b38a03ceaa34400dda74a7a
Merged-In: If8088a6c9949057e4fbc56d2750fc0187237c9d4
tree: 3af0da96a97fa8419ea9fc6587cac5a3a59dea1f
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk