tree ce2620bfcd981e0b9a023ba424f4dfb00c53ec4a
parent 2846041031d84869c3ee0af5e834b975697aa996
parent caf742fdf5122799233f851569535ea3c51396a7
author Kenny Root <kroot@google.com> 1275450758 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275450758 -0700

am 85fb2066: Amend previous ndc commit

Merge commit '85fb20665feadda526ad422c093b859e8c4d40bc' into froyo-plus-aosp

* commit '85fb20665feadda526ad422c093b859e8c4d40bc':
  Amend previous ndc commit