OSDN Git Service

resolved conflicts for merge of 5c42abe7 to master
authorMatthew Xie <mattx@google.com>
Sat, 28 Jun 2014 00:51:40 +0000 (17:51 -0700)
committerMatthew Xie <mattx@google.com>
Sat, 28 Jun 2014 00:51:40 +0000 (17:51 -0700)
commit787c5061c1907336762134e665fc59acbbd7e0b4
tree39229397279f2e81501a772793953e201edb4cd7
parent88cf4dd67184e7b8542a687ddc2faf50dbbf170e
parent5c42abe7b9630914314fae86d09a117317f1633f
resolved conflicts for merge of 5c42abe7 to master

Change-Id: I71ad8ed50fc6025282d3eeff50323d9b43fa20d4