Merge remote-tracking branch 'goog/ics-aah'
tree: bbb2970f5839fbca232db83e115a0f3216aa9296
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml