OSDN Git Service

resolved conflicts for merge of aca203ff to ics-mr1
authorBart Sears <bsears@google.com>
Mon, 21 Nov 2011 05:03:42 +0000 (21:03 -0800)
committerBart Sears <bsears@google.com>
Mon, 21 Nov 2011 05:11:32 +0000 (21:11 -0800)
commitbb0e59be7c01fd9eb85d81b92c0527bac5402d1d
treec93dd28f3ffa0a325e6641c18e229382854b0ddc
parent1ca1730b88e45d39c9211793d133cae148b134a1
parentaca203ffb654fe069f84cae38bcb61d4df2c4ba7
resolved conflicts for merge of aca203ff to ics-mr1

Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149