tree cfcfc78d1ac8aef5379091040ad81108e8e42c20
parent adb627992491758ef7d2549a524e139991e2612d
parent 3c0eb618a6398926893508f9d05fa39a99cf4894
author Treehugger Robot <treehugger-gerrit@google.com> 1487384976 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1487384976 +0000

Merge "Note WifiState in BatteryStats"