Commit ed68dfd3 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
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
am: e92aa3b3

Change-Id: I3d459263939c9f6442fef2c6ca7cc1ea10127844
parents b5ae48e6 e92aa3b3
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