tree 41810c23e8a2e8df3a306ff4b722587170b20723
parent 230f15a33490be9e1746d0c80d726cfbfb6ce733
parent df1cb8526d8b607b29f65265c1ca6e723322af76
author Tomasz Mikolajewski <mtomasz@google.com> 1480505157 +0000
committer android-build-merger <android-build-merger@google.com> 1480505157 +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

Change-Id: Id09b25850b6da557d01c24063a391be98fec912b