OSDN Git Service

resolved conflicts for a7a277cf to master
authorPavlin Radoslavov <pavlin@google.com>
Mon, 19 Oct 2015 20:09:47 +0000 (13:09 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Mon, 19 Oct 2015 20:09:47 +0000 (13:09 -0700)
Change-Id: I63d0a0742a5476f5b951f10956b726810882565c


Trivial merge