am 3c744ae0: Reconcile with ics-mr1-release

* commit '3c744ae00f2346628f047046d68709916b3d5fa2':
tree: 764d888abd4a0de46e6ba7fbc2ea238f6e4d6f1d
  1. java/
  2. res/
  3. tests/
  4. Android.mk