Mathias Agopian ed7c8c9046 am 808fd2ff: am 865991b0: Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread ...

Merge commit '808fd2ff89fa2feee568bb64017eece73d6b24cb'

* commit '808fd2ff89fa2feee568bb64017eece73d6b24cb':
  Added partial support for repporting sensor activity to IBatteryStats

2010-07-21 18:13:27 -07:00

..

audioflinger

resolved conflicts for merge of dd206093 to master

2010-07-20 13:37:19 -07:00

camera

…

java

resolved conflicts for merge of bc54e63c to master

2010-07-21 18:10:22 -07:00

jni

resolved conflicts for merge of bc54e63c to master

2010-07-21 18:10:22 -07:00

sensorservice

Added partial support for repporting sensor activity to IBatteryStats

2010-07-19 17:57:29 -07:00

surfaceflinger

…

tests/servicestests

am 7da38863: am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo

2010-07-21 15:00:27 -07:00