OSDN Git Service

Merge changes I38c8ec64,Iac544226
authorAndre Eisenbach <eisenbach@google.com>
Tue, 22 Mar 2016 01:04:45 +0000 (01:04 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 22 Mar 2016 01:04:45 +0000 (01:04 +0000)
commita72735cdea8b2cfe15bd03826d4881dedda8004c
tree6fd4516489e5a25fbb9b2ff8235561b8163b2227
parent7296f0530c435e88df31d08519705a0517943b5a
parentfae6b54e8d3edf8c890ca3be212b27d591acad03
Merge changes I38c8ec64,Iac544226

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