Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:56:02 +0000 (17:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:56:02 +0000 (17:56 +0000)
commit749a3c872fb2e8ef2f54cbbdac97df9f9ee9bb15
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parentc5078c21b99546b12924d41729fd8cb1f87237e8
parent275fec0f421fa4863af70e31e2afbdd4f2a90655
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b am: e081977eb5 am: ef7affb8db
am: 275fec0f42

Change-Id: I27b4fa6e9612439821d891516a761f3f819217d6