merge in ics-release history after reset to master
tree: 21a3c6f96403b844ba35f1f883c98a11ebfd4b2e
  1. java/
  2. res/
  3. tests/
  4. Android.mk