Merge 10952656

Merged-In: I420776f026f2cb7bb5b1440846c281d9decabb6c
Change-Id: I64279462740e7c0e6e2df99164bbaeb5bae85ea4
tree: c82e4130d65f14b0c80ee71f9f3b7f6de24c1141
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk