Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
authorXin Li <delphij@google.com>
Tue, 22 Aug 2017 19:14:48 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:14:48 +0000 (19:14 +0000)
commit85703f016d71d2e142a9f8dc4ce9680807cdeacf
tree95d77d49ffa3e447a4ceda5b8072f009adc8b93e
parent5766ebb712e27cb970d34790032eb62ef2331a4b
parenta4bf1f8d02b6d4a83deee8c038364e0d7d94af7b
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am: 2a9d42a651 am: c3801f447c am: 43afd5fa99 am: d7680c7cc0 am: 323062fb5e
am: a4bf1f8d02

Change-Id: Ie41bb91478ca5642814fdc571276f967ef69cce5