OSDN Git Service

Merge "Roy West's fix is stuck in auto-merger"
authorRoy West <rwest@google.com>
Thu, 27 Jan 2011 04:49:25 +0000 (20:49 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 27 Jan 2011 04:49:25 +0000 (20:49 -0800)

Trivial merge