OSDN Git Service

resolved conflicts for merge of 9b4660a1 to master
authorRaphael <raphael@google.com>
Fri, 25 Mar 2011 23:21:38 +0000 (16:21 -0700)
committerRaphael <raphael@google.com>
Fri, 25 Mar 2011 23:21:38 +0000 (16:21 -0700)
Change-Id: Ide155e276c6e994ad330a5ac1c2676a7acc1efed


Trivial merge