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)
commit2396a0db9264d5b1c1243d9eb9c563d43f5e586e
tree895d52fec5154971f8eda47b94868c13b9053a6a
parent507c3eac6a46ae2fa2b8b052003d5691cb7b9bfc
parent9b4660a1c6edae915c39261bc3d1a3f3696075c4
resolved conflicts for merge of 9b4660a1 to master

Change-Id: Ide155e276c6e994ad330a5ac1c2676a7acc1efed