am 70b82c71: am 4db60250: Reconcile with ics-mr1-release

* commit '70b82c719ea95d3b4b68c4cf5f0ef257120039f5':
tree: 4303fc8792cc22a93641a0a5e0f6e4eab3aed240
  1. res/
  2. src/
  3. test/
  4. android-changes.txt
  5. Android.mk
  6. build.xml
  7. moe.sh
  8. NOTICE