tree 775913c313d362727ec4a4865a0ccb852807cd23
parent 99861c2a3890ce8160b02eda30bd5a8cab2a3415
parent 39b190f4df64626f2adb16238898db750611730b
author Android Build Merger (Role) <android-build-merger@google.com> 1480506133 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1480506134 +0000

Merge "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 am: 69d526701a" into nyc-mr2-dev-plus-aosp