tree 5fde4065940544398ace1a1889b99fc7db88ad5a
parent bf58010a542feace9a0b89916fcd440efd0fc9da
parent 43118986caea9b66ee96b8127e14c84609b3e02f
author Kenny Guy <kennyguy@google.com> 1400071735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400071735 +0000

am 43118986: Merge "Return null from compat when resolveActivity returns null." into ub-now-nova

* commit '43118986caea9b66ee96b8127e14c84609b3e02f':
  Return null from compat when resolveActivity returns null.