undo reset to ics-mr1 until we have a better method
tree: d9715f74b8172696bfcf5fc5de1960522d68a3d2
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml