Commit 935eb535 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

[automerger skipped] Merge "Teach charging job constraint tests about... 

[automerger skipped] Merge "Teach charging job constraint tests about no-battery devices" into nougat-cts-dev
am: b4dc354f -s ours
am skip reason: SHA1 b4dc354f skipped by user rossyeh

Change-Id: Ie6227d483875de41ffc4ac7efe5ab76400712885
parents b5292b71 b4dc354f
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