| commit | 902bc7bcea710d4698ce571ac3042a5338fc94e1 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Mon Jan 24 23:45:43 2011 -0800 |
| committer | The Android Automerger <android-build@android.com> | Mon Jan 24 23:45:43 2011 -0800 |
| tree | 7a69d828f1842e70c85481e0ed0c576d4c2dd09b | |
| parent | 8ae584edb2d0349ce42b775de795d9d35761f2da [diff] | |
| parent | 42f87e1b4738635a024b7492cf18ede26d3c5d5d [diff] |
resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp Change-Id: Ic0ea8910670567e1725e42de76e6da0cd09decac