tree 1dc2402b89bac85ebec30fcd731e814bc0541a16
parent 60632795c7c00c12e4d2d4e68c1419c0121f1b8a
parent 26fccaf813f08c987996bacda8d1e2b4225b6a09
author Chenbo Feng <fengc@google.com> 1500400115 +0000
committer android-build-merger <android-build-merger@google.com> 1500400115 +0000

Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999 am: f68fa658b6 am: b5f135dd7d
am: 26fccaf813

Change-Id: I0f193c9e2c649c496f170c9932ae2bb0679ccea3