| commit | 18490fb93e206fd899c3258096cc32f293373c92 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Apr 12 10:27:15 2011 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Apr 12 10:27:15 2011 -0700 |
| tree | e45db3abacf59a0cba4604cde390c310e38e4153 | |
| parent | 0b9b8711a1a2107dc913cc751b7d981fce4f3082 [diff] | |
| parent | 87b3c0dcc45223ff9d5ab2e39d7b9a6953e03f50 [diff] |
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53