OSDN Git Service

resolved conflicts for merge of 0ac38a4e to jb-mr1-dev
authorElliott Hughes <enh@google.com>
Sat, 11 Aug 2012 19:00:51 +0000 (12:00 -0700)
committerElliott Hughes <enh@google.com>
Sat, 11 Aug 2012 19:00:51 +0000 (12:00 -0700)
commit880d3f39f711f9ca6d2ba5c9cf127265fa39efad
tree441668cd11c0f024d44c60c6a26b594877c396b8
parent0de821b0b10bbf3404827f21bfa9a2489d7358c5
parent0ac38a4e5ee55f55ab3e8a895be53bd0d04dcf47
resolved conflicts for merge of 0ac38a4e to jb-mr1-dev

Change-Id: I0978f511f807797f89be4002bca654492231761c