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

Change-Id: I57fd14d4cb2bcc4bde348312e518795b5c69123f