OSDN Git Service

Merge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7
authorLingfeng Yang <lfy@google.com>
Fri, 6 Jan 2017 20:07:11 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jan 2017 20:07:11 +0000 (20:07 +0000)
commitaf75232eedb1bf7ee0513291bbee1c231eed5d8e
tree3bb96bbede6bdd92e0c14df42602e28ce9db3810
parent4deb9fb1c038a61c6d264b7afd7572116cb64771
parent9f751f6eab95c5b8aed4e8b59680bc031a1a18aa
Merge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7
am: 9f751f6eab

Change-Id: I9dfe23339ba1e57709395b07e81b85e3d47b4fc9