| commit | b4bd2daedd7beb5dbe91c4a34cb5b6bf794d8def | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Jul 15 09:55:48 2011 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Fri Jul 15 09:55:48 2011 -0700 |
| tree | 62a3555429c3caf6d6220df764adf91a9ee9b991 | |
| parent | 76652989ac868e97fdd8da6d95918e1c6a274fd2 [diff] | |
| parent | 1acde887d56bbebb681accf41a0c5b36e3853f12 [diff] |
resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783