OSDN Git Service

Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753 -s ours am: edb2373362
authorXin Li <delphij@google.com>
Fri, 8 Dec 2017 04:38:46 +0000 (04:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Dec 2017 04:38:46 +0000 (04:38 +0000)
commit94a41bbb40c92f1b4239de4649d1ce68e32ca080
treecc2131f4ca5f153ba35778ca4252ff3a875f67e9
parenta156bac831da5f8e2390e42c0350c5251af46528
parent6ab6e15c9566f8ffe11d2fa94205903efcb1f607
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753  -s ours am: edb2373362
am: 6ab6e15c95  -s ours

Change-Id: I9cd784500a3dfc6e3b40751840a95fda3a2ba632