OSDN Git Service

resolved conflicts w/4b0c5ee8
authorEd Heyl <ed@google.com>
Thu, 26 Jul 2012 15:02:49 +0000 (08:02 -0700)
committerEd Heyl <ed@google.com>
Thu, 26 Jul 2012 15:02:49 +0000 (08:02 -0700)
Change-Id: Ic03a161b61d42504a7f45f1ac0ffebe3ac9b9e72


Trivial merge