OSDN Git Service

resolved conflicts for merge of d7b15982 to master
authorDianne Hackborn <hackbod@google.com>
Wed, 7 Dec 2011 18:46:20 +0000 (10:46 -0800)
committerDianne Hackborn <hackbod@google.com>
Wed, 7 Dec 2011 18:47:11 +0000 (10:47 -0800)
commitb0f29e007d86b001cf30050ba71bf94bf8ba9e13
tree9cf7177626b54612e09d349c2c5c21e3da7620c6
parent6bc8adeadf95203954a134769eaa217d62ba975c
parentd7b15982d21bad7a34bba3c6aa1d6448cda117dc
resolved conflicts for merge of d7b15982 to master

Change-Id: Iaa744477dd64e9833888f72186ec0676e99f28e4