Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:02:28 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:02:28 +0000 (19:02 +0000)
commite61860906b76a0e0eb9446e1720a9737e827381b
treeacfe7611b16da9a996f9e9635dc79298058f31ef
parent18e03dc5cb45101ee4ad405a0cc02b86082cd8af
parent89da6ddd7b000b944f78f08462129cd8405c99c8
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2
am: 89da6ddd7b

Change-Id: Ia669fe57bd54b6a6dd233f00e3501ee5e8864826