| commit | a573a30dfe6b8a04544290fd1e24fa988adceaf9 | [log] [tgz] |
|---|---|---|
| author | Lingfeng Yang <lfy@google.com> | Fri Jan 06 20:11:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 20:11:11 2017 +0000 |
| tree | 3bb96bbede6bdd92e0c14df42602e28ce9db3810 | |
| parent | a46b52a4d10c84a99b7f1d05c2b035d1a99f35eb [diff] | |
| parent | af75232eedb1bf7ee0513291bbee1c231eed5d8e [diff] |
Merge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7 am: 9f751f6eab am: af75232eed Change-Id: Ia09e3f510f1ed64659d54dce2ccdae47836811e3