tree e4dd05f2de811443ab1da4f45ee2762858c8096f
parent d00b2f21ee88835dbb2aa3aeac4497f70276d6c0
parent 075852d29637a715ccf003856d7dc520e992e4ca
author Android Merger <noreply-android-build-merger@google.com> 1566859805 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1566859805 +0000

Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "Teach charging job constraint tests about no-battery devices" into nougat-cts-dev am: b4dc354f62 -s ours am: 88bc9c6d27" into oreo-cts-dev am: e92aa3b35b" into oreo-mr1-cts-dev am: c418f2cef0" into pie-cts-dev am: 7c27e2dc74"