OSDN Git Service

Merge commit 'ebbab5196ab1c9dfeb610f6847650da181268e59' into HEAD
authorXin Li <delphij@google.com>
Mon, 13 Nov 2017 22:35:30 +0000 (14:35 -0800)
committerXin Li <delphij@google.com>
Mon, 13 Nov 2017 22:35:30 +0000 (14:35 -0800)
Change-Id: I4589911438030283a85737073c0c4eeb2fd875a9


Trivial merge