| commit | 4a3935898893f955403021fe41cf2bfa3a32dde2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 15:24:11 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 15:24:11 2010 -0700 |
| tree | c5d7fc3e8a6d2962fcc977f1daea834f23b24588 | |
| parent | e246a940426d418b99cf62c547c7a2093811f2fb [diff] | |
| parent | f1a97e53a58f47afa17a9b0d3a5cc9abf7e5ed19 [diff] |
resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c