OSDN Git Service

resolved conflicts for merge of 532679a5 to master
authorDirk Dougherty <ddougherty@google.com>
Thu, 8 Mar 2012 00:58:03 +0000 (16:58 -0800)
committerDirk Dougherty <ddougherty@google.com>
Thu, 8 Mar 2012 00:58:03 +0000 (16:58 -0800)
commit381f475475b11a552a5233c48947cc570c28b1d8
tree8720d606e78c4225f90743f1ce517babeb651f89
parentb279312a9038b9c5b9b05b31b1b1db86f748efd8
parent6a26abbafe8d9a9c2250afcc037c3db5e9d1b42a
resolved conflicts for merge of 532679a5 to master

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b