Merge changes I85492417,I93389a2c into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:47:26 +0000 (18:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:47:26 +0000 (18:47 +0000)
commit89da6ddd7b000b944f78f08462129cd8405c99c8
treeacfe7611b16da9a996f9e9635dc79298058f31ef
parenta87bd26f5cd6142a5e56e023b120ed25526fcb1d
parent37eaa88ac2447c6bb1a143bf4f61d223edce2005
Merge changes I85492417,I93389a2c into nougat-cts-dev
am: 37eaa88ac2

Change-Id: I6d02e17f212b826c62ca711317450214b4a87e71