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)
Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149


Trivial merge