am 324c4c39: Reconcile with ics-mr1-release

* commit '324c4c39cb7e77730d5af2383eafd97b946246e1':
tree: 37b7af03344cc138b5e02f5e3874846cca9bcc2e
  1. java/
  2. res/
  3. tests/
  4. Android.mk