Merge QP1A.190107.001

Change-Id: I8fc63bf061347a2406e160ccaf3cbd5dc44d48d0
tree: 1646583faa980548a7f21f6320217312ca074de8
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml