Mike Lockwood 8df18d3094 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

2009-12-01 18:31:12 -08:00

policy

resolved conflicts for merge of b64c72df to eclair-mr2

2009-12-01 21:21:06 -05:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%