tree 187098a3b2fc8fc00296b08b993657b6211b92d0
parent c3902347f50a2978a6ff02af41ec957ee27abbb8
parent ddfd35dbf9aab0ff196e1d7046ebe6bcd972c7a5
author Pierre Vandwalle <vandwalle@google.com> 1427251433 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> 1427251434 +0000

Merge "add wifi config for power calculation" into m-wireless-dev