OSDN Git Service

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


Trivial merge