Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:03:12 +0000 (17:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:03:12 +0000 (17:03 +0000)
commit00ca87ab812baed3651e5a98930e8d31fad59ac3
tree57e013352b81f414ab6c8e9199cf70c81dc30a61
parentb4ba085af564c02c7137787c9e72789320fee949
parent4b783d2db9a676a53f90712a5c4a202ff005345d
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b
am: 4b783d2db9

Change-Id: I63638f6b6e7af34645c210aa5eade81b348b28ee