OSDN Git Service

Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d
authorLingfeng Yang <lfy@google.com>
Fri, 6 Jan 2017 20:07:19 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jan 2017 20:07:19 +0000 (20:07 +0000)
am: 528a561d4e

Change-Id: I94dc950a2401967c1688290762fea8df0fab96ed


Trivial merge