OSDN Git Service

resolved conflicts for merge of fb339016 to master
authorAdam Powell <adamp@google.com>
Thu, 9 Jun 2011 19:15:10 +0000 (12:15 -0700)
committerAdam Powell <adamp@google.com>
Thu, 9 Jun 2011 19:15:10 +0000 (12:15 -0700)
commit1529e14fd265b1609dc48a4992c81a1d9b4a3c7a
tree713706e3b687bb494c536ef68d1314634302de9f
parent4cc6156566fda1730abab643721f58f240a582c7
parent903f4a0cf3fcdb4140600661f2185502834743c2
resolved conflicts for merge of fb339016 to master

Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac