OSDN Git Service

Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 0658146997 -s ours am: 6e2c1bdca4
authorXin Li <delphij@google.com>
Fri, 8 Dec 2017 04:52:16 +0000 (04:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Dec 2017 04:52:16 +0000 (04:52 +0000)
commitfaf489854086efe1451d40ee52058d2806da53c9
treed2610f9490a685d03f76480b8370926b03bb3faa
parent3059515eec3d361f01b9d7330424bba750cbceb9
parentacbb99ada00b2e017a7402ff7f49874e7a4452e8
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 0658146997  -s ours am: 6e2c1bdca4
am: acbb99ada0  -s ours

Change-Id: I3fe6e85562e0b62e1c3f81fe63562843c69c2a76