OSDN Git Service

resolved conflicts for merge of 845fdba7 to master
authorGloria Wang <gwang@google.com>
Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)
committerGloria Wang <gwang@google.com>
Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)
commit676f7e146caae83fc244ca3881031d4bc004118c
treedda23262c8fedd883abb187f369fea84b746c67d
parent50036a5a9e9439056184dd26a6c442a3b2a9abd2
parent70652d0c7f67831f4563b60bd6e667b1a4b03f02
resolved conflicts for merge of 845fdba7 to master

Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce