Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:11:18 +0000 (17:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:11:18 +0000 (17:11 +0000)
commit5db7872ddddc32452f38aa27894facd190b327ac
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parentf1ddb551d7a919e0e5034b16997b9291970afd54
parent1209ca758bfb738239115312724431f57e613e6a
Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b am: 4b783d2db9 am: 00ca87ab81
am: 1209ca758b

Change-Id: Ic2253ffff67cc40db13f98a517ee994b950457b8