tree cba289740a7f04802f79dd285875f733c2bc369e
parent c35474babc019ad380af9fa3e60c80e161b0ed07
parent 523e22e5277f76b0d77c4a61a941d698b864e07b
author Android Merger <noreply-android-build-merger@google.com> 1566845609 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1566845609 +0000

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