| commit | a53040a705ff5c8fdd47f356a6f4fcac152f3a7f | [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 | 1d726b7b3320d5ba9d210eba530bb7b069e22e58 | |
| parent | c49422fba45656ef1c3c78b64e7507cb66eaf4a0 [diff] | |
| parent | 351778fa024a8e07e7aed2da2fb1e04f9e578420 [diff] |
resolved conflicts for merge of 9bc4039a to gingerbread Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec