OSDN Git Service

resolved conflicts for merge of b6cf4b7f to ics-mr1
authorScott Main <smain@google.com>
Thu, 27 Oct 2011 21:40:53 +0000 (14:40 -0700)
committerScott Main <smain@google.com>
Thu, 27 Oct 2011 21:40:53 +0000 (14:40 -0700)
commita8399c8a134e316ce8bc80080d64b74ef42868f8
tree28eee3f42811afd37db117e8ea5ec72270f61958
parentab786ff8659dd440d99924c25ecb498c740630f2
parentef6143b8dfb14668b4b0341f8c131cbbca0fe3f8
resolved conflicts for merge of b6cf4b7f to ics-mr1

Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320