OSDN Git Service

Merge "Allow emulator goldfish-setup to take wake locks"
authorLingfeng Yang <lfy@google.com>
Fri, 6 Jan 2017 20:03:41 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jan 2017 20:03:41 +0000 (20:03 +0000)
commit9f751f6eab95c5b8aed4e8b59680bc031a1a18aa
tree3bb96bbede6bdd92e0c14df42602e28ce9db3810
parent7db3441edb7addeffab0fa337cde1add11fbdd49
parentd1dad67cd73d43478dae166fe61e82b62685b5eb
Merge "Allow emulator goldfish-setup to take wake locks"
am: d1dad67cd7

Change-Id: I221a66b609a887d06fe65a5719e3bf69dcfa9193