| commit | f8a7ff191af760ee01e5c31f154f0dbc7abfef7e | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Mar 09 17:02:35 2011 -0800 |
| committer | Ying Wang <wangying@google.com> | Wed Mar 09 17:02:35 2011 -0800 |
| tree | 8f3105647568b60e193683184ffddb82e25fbeee | |
| parent | 122b3d196beee18363309fef803389f5b8db7f40 [diff] | |
| parent | 123995f9e1c4318b6b7469754a9d19e5c66b34c5 [diff] |
resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf