Merge "Protect against ActivityNotFoundException" into lmp-mr1-dev
tree: 9296e8d0d01b28183eb810c9a4bb45f2560d9d59
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags