tree c0e685dad81977e7dfd635a1b2b0214ecf68b4cc
parent 1688ef032a44004c4836f0329c2c4605262487d8
parent 9b2a6abc03e209722ee83b5369eac34e07e47c2b
author Tomasz Mikolajewski <mtomasz@google.com> 1480557126 +0000
committer android-build-merger <android-build-merger@google.com> 1480557126 +0000

Merge "Allow failing testUsbAccessory CTS test in some cases." into marshmallow-cts-dev am: 92576739ec am: f33d903b35 am: 5ee5813802 am: 5ade2526c6 am: 4a4968bd56 am: 0e276a39c6 am: 63e9f897fb
am: 9b2a6abc03

Change-Id: I60143ed056a5bbd95d7420e21bfd472530d68281