tree fc3e77adfd9bf4fd4525e80236a6dadd56540cac
parent e5a668d076a22427aea8e92e22b073bac6ff9087
parent a06c97077c838df13a3882d57e841d584fa4aebc
author Jon Larimer <jlarimer@google.com> 1439922022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439922022 +0000

am a06c9707: Merge "Add sanity checks to fix crash" into klp-dev

* commit 'a06c97077c838df13a3882d57e841d584fa4aebc':
  Add sanity checks to fix crash