Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
authorXin Li <delphij@google.com>
Fri, 13 Jan 2017 00:14:39 +0000 (00:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 00:14:39 +0000 (00:14 +0000)
commitc3801f447c56f28a4ee5d8d2f76b71fbc87567ec
tree20e025cb6744fec611794a8d53dae91a261d1c46
parent4f3a58d09678926fc2e1187090534fb296a8baac
parent2a9d42a651ef444f32f0a6e60711bb2c371d3fce
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev.
am: 2a9d42a651

Change-Id: I1a7c1e97354c43a561d91413191fb3b65f5d4f5a