Merge "Fix NPE in device ID dialog."
tree: 4c65892125b74bc1957f020a389aad76e3bd71ae
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags