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