Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:57:05 +0000 (17:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:57:05 +0000 (17:57 +0000)
commitfbe014bdd56bad7d4a061208c65e220f8179f3c3
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent494c1577498444f24d308ee4899b3b8e7f600d60
parentc7295524bedf56e4f42c9600238fb3c8e7c6df51
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b am: 4b783d2db9 am: 00ca87ab81 am: 1209ca758b am: 5db7872ddd
am: c7295524be

Change-Id: Ie99e239159617ea101d5658d1d020f23822fc823