tree 1e47ca68e29d05445e9c7b3929bf535a7a40fa33
parent a6b47cd39a1aa01d807bc24839863ce0a0218b46
parent a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25
author Kenny Root <kroot@google.com> 1282146656 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282146656 -0700

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

Merge commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25' into gingerbread

* commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25':
  Add more error checking for ndc