OSDN Git Service

resolved conflicts for merge of 9358d98d to master
authorSvetoslav <svetoslavganov@google.com>
Thu, 14 Nov 2013 02:43:32 +0000 (18:43 -0800)
committerSvetoslav <svetoslavganov@google.com>
Thu, 14 Nov 2013 02:43:32 +0000 (18:43 -0800)
Change-Id: I1facdcec6eeaa10805300c9d634957fbb86815d3


Trivial merge