| commit | 6043f9643771264ff6832b7367f60c50f1658952 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Feb 24 17:19:38 2011 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Thu Feb 24 17:19:38 2011 -0800 |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 | |
| parent | adc551c0730f9aeef4ca2b156a92489044387d19 [diff] | |
| parent | c806fe156007cc8b656512c85d9fa6520cc4793d [diff] |
resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce