OSDN Git Service

resolved conflicts for merge of c508483d to jb-mr2-dev
authorBrian Carlstrom <bdc@google.com>
Fri, 29 Mar 2013 17:15:42 +0000 (10:15 -0700)
committerBrian Carlstrom <bdc@google.com>
Fri, 29 Mar 2013 17:15:42 +0000 (10:15 -0700)
commit4f362dfe593f4c8638873c3e7f9a53041bf3edd2
treeb22f0979328e96c1f251e32e64ef32b71eebc4b0
parent252c3fd10c9da267c6c2c7772025b92bf1ec74e9
parentc508483d99579bf439728133742d39d89c777615
resolved conflicts for merge of c508483d to jb-mr2-dev

Change-Id: I15a1f2b2391a973645ef14c36bb3ddf71c815bc9