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

Change-Id: Ic518d88a1f22467db42280bcc5e0fc7d413e6c61