OSDN Git Service

Merge "Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge"...
authorDianne Hackborn <hackbod@google.com>
Sun, 9 Jan 2011 21:07:15 +0000 (13:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 9 Jan 2011 21:07:15 +0000 (13:07 -0800)

Trivial merge