tree 8cf3dadb6e9e826c0cd616dfc7bbdb8db920bb06
parent 7e31eb75645df876fa06ce714fd94923978caa9e
parent 175a223183708b32b92d8365b8be040b433b0d44
author Chenbo Feng <fengc@google.com> 1500326584 +0000
committer android-build-merger <android-build-merger@google.com> 1500326584 +0000

Merge "Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev am: 26339f2d77  -s ours"
am: 175a223183

Change-Id: Iaee04005ff709956b3a37242e16c7ecd867ed95b