tree b3dc761922bf5a04a9e793f47f9aa0554f19aebc
parent 310a56dcb0be955329129e87bb4fdcfb785713d9
parent 7f71a70fd937e48b639d0b553b994314f0d2ed87
author Bill Yi <byi@google.com> 1505510166 +0000
committer android-build-merger <android-build-merger@google.com> 1505510166 +0000

Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643  -s ours
am: 7f71a70fd9  -s ours

Change-Id: I9f05351ed2accaa83b18bb425a268fad4adab49a