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

* commit 'fef10c0daac0a5f1d7ed20316e624dfe33f1a3d7':
tree: 967f2714b7c695a2c8690d8099672ae2c639bbb8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags