tree 3fbf9609bcad3809fe61fcf92198cdae144498bc
parent 217e6167726d021119edbabfae8d9f40b6c6d95c
parent 60c7ac262241588f7942ca068f33d706c8fe5cc4
author Elliott Hughes <enh@google.com> 1351038587 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351038587 -0700

am 60c7ac26: am d0f2b7e7: Merge "More upstream NetBSD upgrades."

* commit '60c7ac262241588f7942ca068f33d706c8fe5cc4':
  More upstream NetBSD upgrades.