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