tree b6720ba2698a594cd5035f485ce00fd06cdd6302
parent 21b0fc91e0950bb2f2e52527ad2a3e23d1a5d449
parent 49049aef19f001c6d671a10a3785473e49c056eb
author wsmlby <wsmlby@google.com> 1412253529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412253529 +0000

am 49049aef: am 2e7aa675: am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev

* commit '49049aef19f001c6d671a10a3785473e49c056eb':
  Throw error when no intent can be found