| commit | f5bb5b739a73af87ce9bbe1f206185b323b87e91 | [log] [tgz] |
|---|---|---|
| author | Lingfeng Yang <lfy@google.com> | Fri Jan 06 20:11:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 20:11:19 2017 +0000 |
| tree | 36f191599e3ff2a38eb9993aee70be1938ceed30 | |
| parent | 1cfc60a9895724844205c74663d186f9940ad0d0 [diff] | |
| parent | f0069a0c7fd811c684dc1bbc2c27796916e80b1e [diff] |
Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d am: 528a561d4e am: f0069a0c7f Change-Id: Iff439685a59151844915828ec952880c2843e051