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