am 0d68ca25: am 00ecafbf: am 82ddcc93: Reconcile with ics-mr1-release

* commit '0d68ca25ff17b4ecaf9c96fdf1201f26eedd1d1e':
tree: c032e7ae79145e0789444fffbe510575a4ffd939
  1. java/
  2. res/
  3. tests/
  4. Android.mk