Merge remote-tracking branch 'goog/master' into catchup
tree: 1a273625cb46d82d613d1a4bde4c887c9033344b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. project.properties