merge in pi-release history after reset to master
tree: 20de4bfa13b06ca9049b547d6a7e1ade9729e011
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml