tree d5d3bebc096bea6df26dd5e046170da2eba28f52
parent 36ec928f52271dd1feb4c86b18026564220629e9
parent 06ca06ac6107f88530cc67225c47537621bb41a5
author Jon Larimer <jlarimer@google.com> 1439909734 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1439909734 +0000

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