Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:46:07 +0000 (02:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:46:07 +0000 (02:46 +0000)
commit4fedaa18d039dae2534f5d3e9d7cdeddeeb0c0f2
tree9f6fd349c68314431733a3ca8b12015910eb04a5
parent6ff9efe58c71fd1b947c0d60da42440f4d0a7b2b
parentffc44cfca70e66bb659c537b2f730d3823513a0c
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e am: d1e1ca812f am: 6a64e395a5
am: ffc44cfca7

Change-Id: I1a27a9a985eac26d8db649413ad396551f5323d1