tree ab6f14c0c4ffad6b405801142d3b0d79e9a37e85
parent 28b4361973452e5e1906f0bc70e299a1fbdcf410
parent e6b0084dde5ae729584095cfe17bbc13eac6e5b7
author Yorke Lee <yorkelee@google.com> 1415213410 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415213410 +0000

am e6b0084d: Merge "Protect against ActivityNotFoundException" into lmp-mr1-dev

* commit 'e6b0084dde5ae729584095cfe17bbc13eac6e5b7':
  Protect against ActivityNotFoundException