tree a0c8de12699444750a60aa17359f2de22c9c6392
parent fbd7479ba5d74018eda4da7faabbe8f9e27df5b5
parent 7c59a10bb4e96b8b49e33bedf2514037ade66203
author TreeHugger Robot <treehugger-gerrit@google.com> 1532388556 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1532388556 +0000

Merge "WifiManager: Remove unused param in getControllerActivityEnergyInfo"