tree ad0457f6d3c436a3e0ac6259dfdf9c0154c77fc6
parent a3d1e94ebc4d5a1bab1d9f6ac7de962f8eeebd1b
parent 661e4783a7c57f42849489ed54cf5495ada26314
author Paul Westbrook <pwestbro@google.com> 1363712482 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363712482 -0700

am 661e4783: (-s ours) DO NOT MERGE Prevent crash with bad Intent

* commit '661e4783a7c57f42849489ed54cf5495ada26314':
  DO NOT MERGE Prevent crash with bad Intent