| commit | 48ef9c3c94cb773cd5b30fcd44007b97cab0b24d | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Jan 27 10:44:21 2011 -0600 |
| committer | Jeff Hamilton <jham@android.com> | Thu Jan 27 10:44:21 2011 -0600 |
| tree | 6a90d2de1dbfdd2e78815cffa70373fa433f56c1 | |
| parent | cf5326f6e08efb73b45513920569e6ece3e4b991 [diff] | |
| parent | 3d317da2abe0a0f8e016ab898722181d1376e358 [diff] |
resolved conflicts for merge of 6687ecb4 to honeycomb-merge Change-Id: Id9677d2ef1c03191cf73a7d90e80b57ea686afec