Snap for 4623514 from 47727c55abbc3d6ff7b21a1d62ad426ebacc46de to pi-release

Change-Id: Icea1e05e3868cc22e87a541fb1fef853fc97e3a7
tree: 47c710a929244cfd5dd7d72336b1c55a4f3a40af
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml