Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
authorXin Li <delphij@google.com>
Fri, 13 Jan 2017 00:17:07 +0000 (00:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 00:17:07 +0000 (00:17 +0000)
commit43afd5fa9902ca37a82d5e91c14180b422d82c20
tree20e025cb6744fec611794a8d53dae91a261d1c46
parent05dbe9e32b353192f2067c660ccb1011110e09c4
parentc3801f447c56f28a4ee5d8d2f76b71fbc87567ec
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am: 2a9d42a651
am: c3801f447c

Change-Id: I161050b3925295ab2ede4bb46198bc7d42023de8