| commit | 406cc1bb6300a3d9bb0f3c2e8191ab4a35821b89 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Mar 31 18:08:00 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 31 18:08:00 2011 -0700 |
| tree | 519b6d05c604772a51202b952f6570829891cdb2 | |
| parent | cd4e323e0eb4c01e36233dde15500c57d7f2da4d [diff] | |
| parent | a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1 [diff] |
am a9be570b: resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp * commit 'a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1': Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.