tree 3f11344fef0b9188facc9076fb627d16e3b69643
parent b91e0937f776e7f75164fc4f4d0183467b1c6498
parent 0543e490a182d6776597a16fe9157bf3a7005fdd
author Tomasz Mikolajewski <mtomasz@google.com> 1480505816 +0000
committer android-build-merger <android-build-merger@google.com> 1480505816 +0000

Merge "Allow failing testUsbAccessory CTS test in some cases." into marshmallow-cts-dev am: 92576739ec am: f6466a9477 am: bf8a7a8873 am: 74cb6e4b59 am: 1dc943a6c8 am: e9d9266705 am: df1cb8526d am: 1e6118bc21
am: 0543e490a1

Change-Id: I65298bcb8d2ae444cee79a798c70ebcc9a189ff2