| commit | fb69e0c0ffbb403da7f8e05454605d6caec503d0 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Jan 27 12:29:27 2011 -0600 |
| committer | Jeff Hamilton <jham@android.com> | Thu Jan 27 12:29:27 2011 -0600 |
| tree | 2d4f83dc927b83c5bda962f425505de68c0d9e96 | |
| parent | 5e2113ff273c2e7e095d1ee0fe6471309f8d309d [diff] | |
| parent | 0716ea144d94b9dfce4670e90a849db19a492da9 [diff] |
resolved conflicts for merge of 0716ea14 to honeycomb-merge Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421