Merge remote-tracking branch 'goog/ics-aah'
tree: fcaf7a0c7f98224c37be88d18cefdf971f4eb39f
  1. tests/
  2. AndroidManifest.xml