tree a975cd0122eda7ebdbf43f775f4c161f9e361564
parent 0bd9b4001c489251b52cffc09522915c9166d7ca
parent e12608fcb4bc25c46519c3d56755b2d4bc8b39c2
author Tina Zhou <tinazh@google.com> 1476408641 +0000
committer android-build-merger <android-build-merger@google.com> 1476408641 +0000

Merge "CTS: Add host-side EDI" into nougat-cts-dev am: dae95ffe4b am: e7900f1757 am: 91ac1f5ec5 am: 644f530cf3
am: e12608fcb4

Change-Id: Ic937aad117e8b2ca3d39568692a2b0a065775f04