am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base