tree 985ff02fdaa8fd2890427f750171339bdd2a2839
parent 36fc79e2f8f4b4e186dd7de4c646639c434f3e8b
parent 70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04
author John Reck <jreck@google.com> 1438717710 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438717710 +0000

am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev

* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext