| commit | 3530ebe451fea39b159baa9b8c9f9cd851de42a3 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Sun Jan 16 16:55:28 2011 -0800 |
| committer | Jim Miller <jaggies@google.com> | Sun Jan 16 16:55:28 2011 -0800 |
| tree | d79467991b29538c63f05fce82244b3517b5c083 | |
| parent | 4e7a9feae2c40d40a76eaaa8fcbd5a647bea86ba [diff] | |
| parent | 578e73dac8ba6cd27d3a708f691aefd8a1e33bbb [diff] |
resolved conflicts for merge of 578e73da to honeycomb-plus-aosp Change-Id: I334ae5382220a84881521885b6e3c3991fd8bbb0