Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev am: 67694b5635 -s ours
authorBrian Anderson <brianderson@google.com>
Tue, 7 Nov 2017 21:31:24 +0000 (21:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Nov 2017 21:31:24 +0000 (21:31 +0000)
commit2c50f294f223087fe2c2dfcbcef00c6db6733303
tree0fd7cc49ba17db1e22a5c2195793ee954d0f8564
parent54a2437fa80b1a6a631caf6b31ef15067ae1e7c4
parentf0c5bf3e57e34b3a038548b2c3271bd9102ff325
Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev am: 67694b5635  -s ours
am: f0c5bf3e57

Change-Id: I355455e32e9f30922c4cd8f4966b50eb308aab5e