OSDN Git Service

resolved conflicts for merge of 66650640 to master
authorAndreas Gampe <agampe@google.com>
Mon, 6 Apr 2015 23:22:37 +0000 (16:22 -0700)
committerAndreas Gampe <agampe@google.com>
Mon, 6 Apr 2015 23:22:37 +0000 (16:22 -0700)
Change-Id: I2ece30436199e695c0f2cd5963586a2279578b9b


Trivial merge