| commit | 869fa653e0880fc1f389eb51524bef5183bf713e | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Dec 01 10:40:05 2010 -0800 |
| committer | Irfan Sheriff <isheriff@google.com> | Wed Dec 01 10:40:05 2010 -0800 |
| tree | 09079867f93253ba89ebb12cb88acc2fcf6a4223 | |
| parent | f38b709e470849943befbe88a0daeb7324f5114b [diff] | |
| parent | 525566893bc17101e50b67af76d75abb412b95e0 [diff] |
resolved conflicts for merge of 52556689 to gingerbread-plus-aosp Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a