Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
authorXin Li <delphij@google.com>
Fri, 13 Jan 2017 00:22:42 +0000 (00:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 00:22:42 +0000 (00:22 +0000)
commitf8ffd1d89652199f5e56817bd91553aea230498e
tree72654b6982eea3608f74275e7fed659b23d62784
parent195b079afd77151141d32d8cd9596d5b42672f99
parent53454dcae6a35e1260edee5bbb59053a69bb43b9
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am: 2a9d42a651 am: c3801f447c am: 43afd5fa99
am: 53454dcae6

Change-Id: Ie6f1c5f868a449dc2eebeef03c7e11897fd58553