tree 683874f0ad6e73c7bdda40548e8fcdace725c2a1
parent ced1507f93f3a11527cf2514b2eef46ee5db1d74
parent 0d6832395e45d0b8e399e74fa1718ba05c6dad56
author Kenny Root <kroot@google.com> 1282166488 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282166488 -0700

am 8eaacf46: am e2f95e42: am a34c9ca3: (-s ours) Add more error checking for ndc

Merge commit '8eaacf46dc3bf2f267e5382dfbd9ab6dc06e3e9f'

* commit '8eaacf46dc3bf2f267e5382dfbd9ab6dc06e3e9f':
  Add more error checking for ndc