OSDN Git Service

Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev
authorAdrian Roos <roosa@google.com>
Fri, 23 Sep 2016 22:20:00 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 22:20:00 +0000 (22:20 +0000)
am: 27eb169db0

Change-Id: I169706cac13e20f21c2cdf42156f32095f3a107b


Trivial merge