tree ffe16d3ee11758f08b78d8c1e052e826fe0aca8b
parent 9cd511c5338bef5f4749abba2cf9149f1f436c51
parent 74cb6e4b594d43d0e37e9261cd465f639a55b477
author Tomasz Mikolajewski <mtomasz@google.com> 1480488727 +0000
committer android-build-merger <android-build-merger@google.com> 1480488727 +0000

Merge "Allow failing testUsbAccessory CTS test in some cases." into marshmallow-cts-dev am: 92576739ec am: f6466a9477 am: bf8a7a8873
am: 74cb6e4b59

Change-Id: I674d698329aafdee1de8f9c9c962923a4da4383b