| commit | 341ff13689dfe822b598e626272ac2e80041b482 | [log] [tgz] |
|---|---|---|
| author | Dan Egnor <egnor@google.com> | Tue Jul 20 11:30:17 2010 -0700 |
| committer | Dan Egnor <egnor@google.com> | Tue Jul 20 11:30:17 2010 -0700 |
| tree | 3d6873cfc58ddda63876d6abbd6039e77125f53d | |
| parent | cc14a8393b92cd1ed6cba74829396045605ab211 [diff] | |
| parent | 9bc4039a58e50b66700f87f4f874ed5d662ca9a6 [diff] |
resolved conflicts for merge of 9bc4039a to gingerbread Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec