tree 683874f0ad6e73c7bdda40548e8fcdace725c2a1
parent 2d1e15ff68f2ee1ff5c32d2801b290e138e491ce
parent 5fe75f009739caef9adfa89d521b8939aba2f9fc
author Kenny Root <kroot@google.com> 1282166498 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282166498 -0700

am 7a11ae26: am face0c02: am 46906276: Amend previous ndc commit

Merge commit '7a11ae268cfd9cd1a7887217c926bec19fdccf17'

* commit '7a11ae268cfd9cd1a7887217c926bec19fdccf17':
  Amend previous ndc commit