OSDN Git Service

Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 0658146997 -s ours
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 12:56:41 +0000 (12:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 12:56:41 +0000 (12:56 +0000)
commitacbb99ada00b2e017a7402ff7f49874e7a4452e8
tree270217b9ee7e2ac5f135a5d919f5ef7dab64a4e8
parent04a4c7561cc04daa48c6b5eca4b262c1524e0889
parent6e2c1bdca4ee36286dc01687ce190297a5d6cb79
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 0658146997  -s ours
am: 6e2c1bdca4

Change-Id: If4d6ac81a29e6adbc09ecd96fd3b565603251032