Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:46:27 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:46:27 +0000 (17:46 +0000)
commitc7295524bedf56e4f42c9600238fb3c8e7c6df51
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parent8e31302e8cd0d295d869a68f99dd44e6c5d5fea1
parent5db7872ddddc32452f38aa27894facd190b327ac
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b am: 4b783d2db9 am: 00ca87ab81 am: 1209ca758b
am: 5db7872ddd

Change-Id: I7888556b4eb7ea9495055a6665931b0d4b4ed083