OSDN Git Service

Merge "Various fixes"
authorChet Haase <chet@google.com>
Thu, 7 Oct 2010 20:18:52 +0000 (13:18 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 Oct 2010 20:18:52 +0000 (13:18 -0700)

Trivial merge