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

Commit 2996a070 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

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

Merge commit '90bca75513297c2e851638f06ecc821ce75fcbe5' into eclair-mr2-plus-aosp

* commit '90bca75513297c2e851638f06ecc821ce75fcbe5':
  Fix bug 2290852: Screen wakes up in my pocket while listening to music
parents bbc4a14a a323f380

There are no changes