| commit | cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Oct 07 14:31:21 2010 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Thu Oct 07 14:31:21 2010 -0700 |
| tree | b2c6ff8950fc96c458972d33aee7cf80d33ad31b | |
| parent | d29f5df3663acb01f88347b67056d969e2d49d15 [diff] | |
| parent | 0f8fcbe271cad06cb21e0c4602baf35758f4adb1 [diff] |
resolved conflicts for merge of 0f8fcbe2 to gingerbread Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019