OSDN Git Service

resolved conflicts for merge of 6a828712 to master
authorAdam Powell <adamp@google.com>
Wed, 7 Dec 2011 00:40:49 +0000 (16:40 -0800)
committerAdam Powell <adamp@google.com>
Wed, 7 Dec 2011 00:53:47 +0000 (16:53 -0800)
commit152ecbcbfd3541610caf47981a13261d3fc0cc7d
treea4f7155e7d0e10895947a985fd9e447a72f9a5a0
parent92ce52ab33d2e02cd5544bf0fe52e8673669e9a0
parentbdfa931022aac1bc80192cc4ab1160dfaff19c1d
resolved conflicts for merge of 6a828712 to master

Change-Id: I73c804667a890bcc9924951ff655137c1345541a