tree b5e7cc66eaba5a512a04ddef5914c5eba98bcb11
parent cad2d1da591b0464845bc88a01e9aa0d6dba2347
parent fb026af97462250b7ac8172c52386d4c0e7f7321
author Android Merger <android-build-merger@google.com> 1508194196 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1508194196 +0000

Merge "Merge "Increase battery stats job duration to 5 sec." into oreo-cts-dev am: 58943d91f8"