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