Commit e92aa3b3 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

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

Merge "Merge "[automerger skipped] Merge "Teach charging job constraint tests about no-battery devices" into nougat-cts-dev am: b4dc354f -s ours am: 88bc9c6d" into oreo-cts-dev
parents c35474ba 523e22e5
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