OSDN Git Service

resolved conflicts for merge of b2d0ee16 to master
authorKenny Root <kroot@google.com>
Thu, 19 May 2011 22:02:18 +0000 (15:02 -0700)
committerKenny Root <kroot@google.com>
Thu, 19 May 2011 22:02:18 +0000 (15:02 -0700)
commit920a196eb5995cba3271027223db99422c2ac11c
treea682011d320462a7c841ea4260b587dd21a01d57
parent31ff2eeaf43bae21e55a6398362b1703f752acbd
parentf9fa770f389c0c710bf16fc38f52f6f36ad73793
resolved conflicts for merge of b2d0ee16 to master

Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4