Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15bd2180 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 6cc42b70: am 90bca755: resolved conflicts for merge of b64c72df to eclair-mr2 

Merge commit '6cc42b70c592d5a112809a0230764819de3c7c12'

* commit '6cc42b70c592d5a112809a0230764819de3c7c12':
  Fix bug 2290852: Screen wakes up in my pocket while listening to music
parents 2b1855a1 2996a070

There are no changes