OSDN Git Service

resolved conflicts for merge of 0f8fcbe2 to gingerbread
authorBrian Muramatsu <btmura@google.com>
Thu, 7 Oct 2010 21:31:21 +0000 (14:31 -0700)
committerBrian Muramatsu <btmura@google.com>
Thu, 7 Oct 2010 21:31:21 +0000 (14:31 -0700)
commitcd7170d7ee81d1be9e5c93e9e372e2b58fe5d959
treeb2c6ff8950fc96c458972d33aee7cf80d33ad31b
parentd29f5df3663acb01f88347b67056d969e2d49d15
parent0f8fcbe271cad06cb21e0c4602baf35758f4adb1
resolved conflicts for merge of 0f8fcbe2 to gingerbread

Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
core/tasks/cts.mk