Merge remote-tracking branch oreo-mr1-cts-dev into master. am: 5ea85b4a84
authorXin Li <delphij@google.com>
Fri, 5 Jan 2018 00:32:05 +0000 (00:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Jan 2018 00:32:05 +0000 (00:32 +0000)
commit4149615bae4b58a5ee64ca959e7f2280165c2d9c
tree15542c84188be9740787a6df3904dc11376948ad
parent67af1f82f768e3c91737d71065c1952b2638d2f3
parentb9d6a1fe25873569d7da1c3e06044d9dbe3b102f
Merge remote-tracking branch oreo-mr1-cts-dev into  am: 5ea85b4a84
am: b9d6a1fe25

Change-Id: I36a6aba6e2288b0733522f5ae34e9bb1e449271e