am 21b165ad: Merge "Catch activity not found exceptions"

* commit '21b165ad0f1648b9803efb86c928240e658c0392':
  Catch activity not found exceptions
tree: 91ea5d81f25ceb7ab5d4cd6163e766d6d5633712
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags