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