Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: 89da6ddd7b...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 20:12:39 +0000 (20:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:12:39 +0000 (20:12 +0000)
am: b403c19524

Change-Id: I2dabcb4d1ac1c5c0a9c6d3b4e7f886ee91badaf7


Trivial merge