tree 3bb96bbede6bdd92e0c14df42602e28ce9db3810
parent 7db3441edb7addeffab0fa337cde1add11fbdd49
parent 2c69d027029a95e518827ab2274db9a41ce3f7af
author Treehugger Robot <treehugger-gerrit@google.com> 1483732672 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1483732673 +0000

Merge "Allow emulator goldfish-setup to take wake locks"