| commit | 5e2113ff273c2e7e095d1ee0fe6471309f8d309d | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Jan 27 11:27:58 2011 -0600 |
| committer | Jeff Hamilton <jham@android.com> | Thu Jan 27 11:27:58 2011 -0600 |
| tree | ac656cd29146d19fbdf74db882b18654d7a41c9a | |
| parent | 42bb07dc3f67dd92c6199ce766f3489c08f1ba18 [diff] | |
| parent | 3a223404e7589831a901cb16c5ce97685bc1f3f8 [diff] |
resolved conflicts for merge of 3a223404 to honeycomb-merge Change-Id: I0eb1f3a271797c78d9ec5b2528a221c89973a83c