OSDN Git Service

Merge changes I38c8ec64,Iac544226
authorAndre Eisenbach <eisenbach@google.com>
Tue, 22 Mar 2016 01:17:38 +0000 (01:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Mar 2016 01:17:38 +0000 (01:17 +0000)
commitc63c60b58120a702c843af3c27ffaaa88ed6bcf5
treef6342d377bdcb0b591eeccf15f40a494841d1f81
parent844518bb897a099f333c3d3b980f0c36721834ae
parenta72735cdea8b2cfe15bd03826d4881dedda8004c
Merge changes I38c8ec64,Iac544226
am: a72735c

* commit 'a72735cdea8b2cfe15bd03826d4881dedda8004c':
  Make sure wakelock is held before releaseing it
  Do not delete/re-create wakelock on acquisition/release