| commit | a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jul 13 18:59:56 2010 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Jul 13 18:59:56 2010 -0700 |
| tree | c4331554c53e7aa848167ead929215b067aa98f9 | |
| parent | 90b1d3dcfece8eef53277cbcf0326deda9f16f09 [diff] | |
| parent | a6bed2f723cce6e684102890b4e6cb224412a1ce [diff] |
resolved conflicts for merge of a6bed2f7 to gingerbread Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03