am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version...
am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
* commit '82de141d':
DO NOT MERGE Use previous version if version is a codename