| commit | c06e7abe6f37d1d8bc4f1c228964229d9f101d70 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Feb 10 13:47:32 2011 -0800 |
| committer | Scott Main <smain@google.com> | Thu Feb 10 13:47:32 2011 -0800 |
| tree | d47e7ab71ae711e1e1dc28dabbbff19a9853d00f | |
| parent | ce7c05e842d4e35ce180d398ecb969aad18f3460 [diff] | |
| parent | 42f18194974f6db9ca32f5b4229fb219198dabdd [diff] |
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7