OSDN Git Service

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

Change-Id: Ia09e3f510f1ed64659d54dce2ccdae47836811e3