OSDN Git Service

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


Trivial merge