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