| commit | 38a1345b8dc59a8acbaa9013b4ddb2efc6dc6afe | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Apr 04 15:12:13 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 04 15:12:13 2011 -0700 |
| tree | 4bb01528d4691740ec94528d0816f65706be34ed | |
| parent | 78a9f6a8227d1e9b465acb84f8476a30c5af9c13 [diff] | |
| parent | 549177e4f3f5e2a92e1431c157cebb985068a5ee [diff] |
am 549177e4: Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp * commit '549177e4f3f5e2a92e1431c157cebb985068a5ee': Fix bad merge.