OSDN Git Service

Merge "Allow emulator goldfish-setup to take wake locks"
authorLingfeng Yang <lfy@google.com>
Fri, 6 Jan 2017 20:03:41 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jan 2017 20:03:41 +0000 (20:03 +0000)
am: d1dad67cd7

Change-Id: I221a66b609a887d06fe65a5719e3bf69dcfa9193


Trivial merge