Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:00:16 +0000 (17:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:00:16 +0000 (17:00 +0000)
commit4b783d2db9a676a53f90712a5c4a202ff005345d
tree326c60d60cf31a9f1a176e213f6fc16c03b0bed3
parentfc557472cb5d044fc280742114f5e4a35ef2e1b7
parenta7dc5ef89bceb50a0db45f8bac2c6288d899c183
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2
am: a7dc5ef89b

Change-Id: I50907e813c211098054846237debca1520e5607e