Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: 89da6ddd7b...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:18:45 +0000 (18:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:18:45 +0000 (18:18 +0000)
commit3feb68231dd1d77da6697854305cde45936169e6
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent9bb0d008a24a0fb39a5700416135119b07ba1aa5
parentb6d1e63153abc7a90bf848e865f9871cdafe8e8a
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: 89da6ddd7b am: e61860906b am: baa7680368 am: b403c19524
am: b6d1e63153

Change-Id: I9c160f3986f13d7f9547b6d243c2b4ec1db1c157