tree 3f8895ee090a27509e21b667752a9da6a7445367
parent 3d87193981c1eccaef58142225d0a3db3e55b749
parent 0e276a39c6a87cc8ffacb8e4de1a4b6a4bd85711
author Tomasz Mikolajewski <mtomasz@google.com> 1480555947 +0000
committer android-build-merger <android-build-merger@google.com> 1480555947 +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

Change-Id: I2def2b26ed5c53651dade13deb91a7a09081dcf1