Commit 46ad34ea authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "Teach charging job constraint tests about no-battery devices" into marshmallow-cts-dev 

am: 11ef468f

Change-Id: I5bac78173ddb98868e941609e4266dbb62ff4f44
parents 78f64660 11ef468f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment