Commit 2ac5958a authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

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

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

Change-Id: If2c9b76a534ad930cd2f3d4612b5d2f5fc085fce
parents 8b6aaf4a 88bc9c6d
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