OSDN Git Service

resolve merge conflicts of fc78eb998e to master.
authorPaul Jensen <pauljensen@google.com>
Wed, 27 Jan 2016 13:29:19 +0000 (08:29 -0500)
committerPaul Jensen <pauljensen@google.com>
Wed, 27 Jan 2016 13:29:19 +0000 (08:29 -0500)
commit3fe9a6c111cb74e75319c99480783062313c0d84
tree7f5248166fbeeceab1f4933d966254961ad4ab9f
parent75e128fb560f8fee283ee5903ec9ce95c5329124
parentfc78eb998e8478a3fa3e16263dd0aa80946ba591
resolve merge conflicts of fc78eb998e to master.

Change-Id: I1cd9a0f0c4f21ae4a6b6cbace7ed5ab5b1f8849f