Commit fcebcad0 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

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

[automerger skipped] 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 skipped: 2ac5958a

Change-Id: Ib33eca20762fd5c594a99fdb6538616f677f1a57
parents 9cdc2bfb 2ac5958a
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