OSDN Git Service

resolved conflicts for merge of 67cda1a0 to master
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 24 Jan 2012 23:02:06 +0000 (15:02 -0800)
committerRobert Greenwalt <rgreenwalt@google.com>
Tue, 24 Jan 2012 23:02:06 +0000 (15:02 -0800)
commit81519e611a066c6d858c2e4978c46be5f73c247b
tree00a33b69f01e5090951a7877f38de4a54753efa2
parent9f46b11229169a9ea42a62f75e72ae54aa14dade
parent67cda1a0ec2f443293d0ada7c49708ff4a11c8c7
resolved conflicts for merge of 67cda1a0 to master

Change-Id: I5ea4398b209faa381f1c50ed6d51fed06d245af1