| commit | 5ac971625c01ce1bc18f678e8587c0f212251c79 | [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 | 6a90d2de1dbfdd2e78815cffa70373fa433f56c1 | |
| parent | 5ea972650d2703818e9147d9550d359d324ba0ed [diff] | |
| parent | c52ca2f61e5c5fd40749f4027ba7df9a98e4cd61 [diff] |
resolved conflicts for merge of 0716ea14 to honeycomb-merge Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421