Merge "Increase wired mode timeout to 10 seconds." into gingerbread
tree: 9a133d2f52548cd0c166626cde2ea9ede296378e
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. migrate_nfc.txt