Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:05:19 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:05:19 +0000 (17:05 +0000)
commitef7affb8dba95c40afddb5f171c501deac3f3d55
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parentcb63278c7e573ec9f978b25d79f4fb0ad052f609
parente081977eb5f0d87023db39790cc78f6a4f52aa14
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b
am: e081977eb5

Change-Id: I982707d42ff59124aa59213ed9d95df294a3650e