am f0631ff3: Reconcile with ics-mr1-release

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