Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:56:24 +0000 (02:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:56:24 +0000 (02:56 +0000)
commit2597c25fd9c7260d2af983a53aeb3dd075ec78c6
tree9f6fd349c68314431733a3ca8b12015910eb04a5
parent80758ecfbfa1c12615c5dafa904f27eedafa332c
parentaa9cd15468aebf98e15ed65954e1dda5b150c0ae
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: f2ab59be70 am: a911a04556
am: aa9cd15468

Change-Id: I0cb6261e655df6a06fdc00c8120a733cc395b95d