am f656d950: (-s ours) am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2

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