Commit 88bc9c6d authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
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 skip reason: SHA1 b4dc354f skipped by user rossyeh" into nougat-mr1-cts-dev
parents b5292b71 935eb535
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