| commit | d57579a4a4ee84d80f616ea995a86d4734abfe2d | [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 | 20f0af73fbac0a4fc6a442de99839ae251140892 | |
| parent | 6b5e201d4717091d1c54fb561ea2dea9f6e9b17a [diff] | |
| parent | e8d2a4a8a02bc4533fb6bfb951c0476ad3ce60d7 [diff] |
resolved conflicts for merge of e8d2a4a8 to honeycomb-plus-aosp Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783