OSDN Git Service

resolved conflicts for merge of b40c2385 to jb-mr1.1-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 14 Jan 2013 19:46:38 +0000 (11:46 -0800)
committerRobert Greenwalt <rgreenwalt@google.com>
Mon, 14 Jan 2013 19:46:38 +0000 (11:46 -0800)
commitd67cc366f769a84f56755b12d2c943113ec46f8c
tree37c86da3588552d23f3a8678e9e6bcb2b541c583
parente0644327ffb203e0b45f3192fd888831902e267c
parentb40c2385c7ef44fa0f2369a5378b539dc29c2779
resolved conflicts for merge of b40c2385 to jb-mr1.1-dev

Change-Id: I0cef2141487ffd2cb5694a10e4077c299d9d7df7