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

Change-Id: Iab0ab07eeedaf7f009610b79874d168e7a81eb53