Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev am: 67694b5635 am: aa425927d0
authorBrian Anderson <brianderson@google.com>
Tue, 7 Nov 2017 20:02:39 +0000 (20:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Nov 2017 20:02:39 +0000 (20:02 +0000)
commit56a71df736dd1a9bb6a6b2b6b9854632935885ff
treea6e730f0a3b0c5bceb131f547f30692e7f19c5b8
parent6976d1f9ba11a8d19830b40ca4beb40e0c90aed6
parentefb1ae2ab9205568338eb760286cfadbd1a23d39
Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev am: 67694b5635 am: aa425927d0
am: efb1ae2ab9

Change-Id: I5623468a2c31d7e265e89f5d860e61fe911e225b