Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release
tree: 4ae2011fc0314aca37abbc3a13d3323a4ed672fe
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. migrate_nfc.txt