| commit | b052ecaa7e6ce40cec43efe5353b4bb12079aa55 | [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 | a02d60c928a7fa72d10346cd23d60589224a097f | |
| parent | 86409c8cb789cd7f672ee6de43e6bf1a337847db [diff] | |
| parent | 86e43034a6834a274efefaabefc0dbdd1bbc8d35 [diff] |
resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce