| commit | 70d6ec5f9b2b3ae9da0ee28667abf93c5383b991 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Mar 07 11:07:12 2011 -0800 |
| committer | Ying Wang <wangying@google.com> | Mon Mar 07 11:07:12 2011 -0800 |
| tree | 8b4c5f40b2ebbcea48fd349c5ada6f7c4be7ccd7 | |
| parent | 71704a690d19de2c5151195c176b65c9fc65390a [diff] | |
| parent | 0a1f3236e319384bec11061a242a9ac44c785278 [diff] |
resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d