OSDN Git Service

resolved conflicts for merge of 301b97ac to eclair
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2009 19:26:44 +0000 (12:26 -0700)
committerDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2009 19:26:44 +0000 (12:26 -0700)
Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48


Trivial merge