tree 26b75eef7b9bf6f7b1d7b185cdfa8e5774620cd7
parent 2f1a7e987e72b830c608f2be59799ec167db2a7e
parent ec27e78ddc838d4104d0c7d478bfa0a69baeec6e
author Brian Muramatsu <btmura@google.com> 1303253596 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303253596 -0700

am ec27e78d: (-s ours) am 0cfbb02f: Merge "Fix BuildVersionTest" into gingerbread

* commit 'ec27e78ddc838d4104d0c7d478bfa0a69baeec6e':
  Fix BuildVersionTest