| commit | e4354ba71e9ac21ff4e6864da7287db472c50e84 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Aug 03 13:47:37 2011 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Wed Aug 03 13:47:37 2011 -0700 |
| tree | 6f6cee9949cc32e293e37383851f99f7da490cbe | |
| parent | dc6e4e64de0036021dc4491ab0760d3aeb364019 [diff] | |
| parent | d2819621943bdbd1619ecb92547f18efc6518567 [diff] |
resolved conflicts for merge of d2819621 to honeycomb-plus-aosp Change-Id: I2c84ffb40bd1db769b9ce271206c3b680a4e3179