Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
authorXin Li <delphij@google.com>
Tue, 22 Aug 2017 19:14:19 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:14:19 +0000 (19:14 +0000)
commitfdf4a0dee6ba289f5fa7137aee43e3816b4c1eed
tree95d77d49ffa3e447a4ceda5b8072f009adc8b93e
parent6c985e5879681a4632e6fccd6d02839da53a650a
parent5fdb13fc11c9dead97dd2ce7007878a0a8c09a3d
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am: 2a9d42a651 am: c3801f447c am: 43afd5fa99 am: 53454dcae6 am: f8ffd1d896
am: 5fdb13fc11

Change-Id: I600549327c2134e8e21728f7406b217566b925c5