| commit | ee3bd4624522adac89a3bf24efde495e10fd7da5 | [log] [tgz] |
|---|---|---|
| author | Lingfeng Yang <lfy@google.com> | Fri Jan 06 20:18:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 20:18:51 2017 +0000 |
| tree | d2d34d297040f679f41a61e3dd169a60bb847e02 | |
| parent | 08493378055147221e13197d6b89567bb7766d16 [diff] | |
| parent | f5bb5b739a73af87ce9bbe1f206185b323b87e91 [diff] |
Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d am: 528a561d4e am: f0069a0c7f am: f5bb5b739a Change-Id: I46f1077c114e1e7f972dc1823277d66b01348424