Merge remote-tracking branch oreo-mr1-cts-dev into master. am: 5ea85b4a84 am: b9d6a1fe25
authorXin Li <delphij@google.com>
Fri, 5 Jan 2018 00:36:09 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Jan 2018 00:36:09 +0000 (00:36 +0000)
commitf578699d457a4d1dd8a73fa5de9b81aba9438dff
tree15542c84188be9740787a6df3904dc11376948ad
parent7284f8501d152276b5cb4227f6ec1a7d9a778edc
parent4149615bae4b58a5ee64ca959e7f2280165c2d9c
Merge remote-tracking branch oreo-mr1-cts-dev into  am: 5ea85b4a84 am: b9d6a1fe25
am: 4149615bae

Change-Id: I5f089d988ef2bc3d7d40759986e0986eaffb5235