OSDN Git Service

resolved conflicts for merge of 3c70ace5 to master
authorMatthew Xie <mattx@google.com>
Thu, 4 Dec 2014 07:59:14 +0000 (23:59 -0800)
committerMatthew Xie <mattx@google.com>
Thu, 4 Dec 2014 07:59:14 +0000 (23:59 -0800)
commitbc4bc49d6a502bf9d49ea4e6adfcb97e3420b131
tree819d579d312a9074d691a0ceae3e552afcfb8c9a
parent78e4e3296d1fc149a0f855c265f5cb5afd15aef1
parent3c70ace5af31d14691de34be35d7c7c73c3fe423
resolved conflicts for merge of 3c70ace5 to master

Change-Id: I58e5d99e8caa7775b075ac5e149535cb935229ee