tree 72f1392cf678c379727452102128850220b5943b
parent bbca81334e3603c7328dc526bd63032b23d5261d
parent 82de141db736b95b0e388ff060e2d2535192d769
author John Reck <jreck@google.com> 1306194808 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306194808 -0700

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

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