tree b3dc761922bf5a04a9e793f47f9aa0554f19aebc
parent 4ee9600280836b0512e5afbaabfe598bff179979
parent 880ad913b8bce99a97c072fbb869d502cd37303c
author Chenbo Feng <fengc@google.com> 1505427084 +0000
committer android-build-merger <android-build-merger@google.com> 1505427084 +0000

Merge "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: 46acd158a2

Change-Id: Id99b60b98e06a43c2e9ad645ee0e50b5395a8bff