Merge changes I85492417,I93389a2c into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 16:57:15 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 16:57:15 +0000 (16:57 +0000)
commita7dc5ef89bceb50a0db45f8bac2c6288d899c183
tree326c60d60cf31a9f1a176e213f6fc16c03b0bed3
parentd030a8fd2b6ddc8c232a898a1a6e46db603dbce2
parent37eaa88ac2447c6bb1a143bf4f61d223edce2005
Merge changes I85492417,I93389a2c into nougat-cts-dev
am: 37eaa88ac2

Change-Id: Ifd718e72afa57309ea88cfb09f9073cd87c1c116