Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
authorXin Li <delphij@google.com>
Fri, 13 Jan 2017 00:25:12 +0000 (00:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 00:25:12 +0000 (00:25 +0000)
commit5fdb13fc11c9dead97dd2ce7007878a0a8c09a3d
tree57c6c496041e787593e6de62e94d2c88fae4c188
parentcaa4311374ed4e742bf6630c370daa7d04e5c7c7
parentf8ffd1d89652199f5e56817bd91553aea230498e
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am: 2a9d42a651 am: c3801f447c am: 43afd5fa99 am: 53454dcae6
am: f8ffd1d896

Change-Id: Ice448e3c63cf9099333910a8c5a39e3e835842d3