Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev am: 67694b5635 -s ours am: f0c5b...
authorBrian Anderson <brianderson@google.com>
Tue, 7 Nov 2017 21:51:49 +0000 (21:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Nov 2017 21:51:49 +0000 (21:51 +0000)
commitfa7f8e76c8e7cef3fbbe96d123e4d5a74a79c9e9
tree315a402a2611f2d2fd1b19ff54e3e3875403f459
parent6a46f98d8d09ba6ca77700e693b8ad5cec55c02e
parent2c50f294f223087fe2c2dfcbcef00c6db6733303
Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev am: 67694b5635  -s ours am: f0c5bf3e57
am: 2c50f294f2  -s ours

Change-Id: I9e5e33115b6907b58f282d0337222b0302696e1e