Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:46:01 +0000 (02:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:46:01 +0000 (02:46 +0000)
commita911a0455642e6cc012faf536575d393390812ae
treea13cf3d0c39db94fedc11c788b68b9d581a660c7
parentad154a3284c79064d42286a76577f57eef4a3c15
parentf2ab59be7038c39680d1eff4e02c6d655f63b492
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f
am: f2ab59be70

Change-Id: I463700034a673d0a81d93c8072eba4fa99d30523