| commit | a125c937de06b1cc43368743592f47513eb88b76 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Jul 20 16:31:25 2011 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Wed Jul 20 16:31:25 2011 -0700 |
| tree | 514f08565d17813860d4cc240162806f3fda9816 | |
| parent | 57aebc6109f2059ba335a02bf95928a494cff4ba [diff] | |
| parent | 2c311be720341e3249887e592bbc1881008b02bd [diff] |
resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe