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)
commitb6d1e63153abc7a90bf848e865f9871cdafe8e8a
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parentf97ca6696e3a89c76667f8ced22433e361bbe49d
parentb403c19524d49b7d99313483531ce5e9be2fd603
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: 89da6ddd7b am: e61860906b am: baa7680368
am: b403c19524

Change-Id: I2dabcb4d1ac1c5c0a9c6d3b4e7f886ee91badaf7