OSDN Git Service

DO NOT MERGE: Merge Oreo MR1 into master
authorXin Li <delphij@google.com>
Wed, 6 Dec 2017 19:52:09 +0000 (11:52 -0800)
committerXin Li <delphij@google.com>
Wed, 6 Dec 2017 22:24:54 +0000 (14:24 -0800)
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969


Trivial merge