am 4db60250: Reconcile with ics-mr1-release

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