Merge commit 'd3ffa4914baebe668d540fc966efddd0c89a92a2' into merge_work

Change-Id: I79fa0e84dc5ba0f2f9282cd4b209c2022d740b8d
tree: e4922468885f1a9e9ed72005f2e3d30a9d8d260b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags