OSDN Git Service

Merge "Work in progress towards a Windows port." into kraken
authorGlenn Kasten <gkasten@google.com>
Fri, 4 Jun 2010 00:09:40 +0000 (17:09 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 4 Jun 2010 00:09:40 +0000 (17:09 -0700)

Trivial merge