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)
am: 9f751f6eab

Change-Id: I9dfe23339ba1e57709395b07e81b85e3d47b4fc9


Trivial merge