tree aa39ed32eb607bb6421631722053b8d8a5bd82fa
parent 14298e1c71a11a50a01ef01464b8568a6a9444f0
parent fe750a4010fc6ffca6413435349bb8c8d3de2222
author John Reck <jreck@google.com> 1306194623 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306194623 -0700

am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2

* commit '4a74eb679917797bf77a20773e0c079f5cc808e4':
  DO NOT MERGE Use previous version if version is a codename