commit | aa9fff8cb457cb5330390dcd82868a0f480a26fe | [log] [tgz] |
---|---|---|
author | John Reck <jreck@google.com> | Tue May 24 12:56:32 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 24 12:56:32 2011 -0700 |
tree | 97d5f5d08af6b787cdb4686ebb0679f367e63ac3 | |
parent | c42b791b7484ee3f1e42a70c691c6945bc52c153 [diff] | |
parent | f656d95078fbcb65df7753ba8c04679c5389e15c [diff] |
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