Merge branch android10-qpr2-release

Change-Id: Ibd4155644c21e3bd76dde4fd06e87d51764b7ffe
tree: dcfbc0ee49a50e10a71068cf18d6c92db85123c4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml