Jesse Hall c6694b4cb4 resolved conflicts for merge of e94d204a to master ... Change-Id: Idb2030dbb25a2e4b972492587558b25a305e68bd		2013-10-15 17:22:33 -07:00
..
batteryservice	libbatteryservice: add interface to read individual battery properties	2013-08-22 01:57:19 +00:00
connectivitymanager
inputflinger	Remove input flinger stubs. (DO NOT MERGE)	2013-08-22 18:40:07 -07:00
powermanager	Allow blaming a single uid for work done	2013-10-03 08:49:07 -07:00
sensorservice	am 487c7815: am 641a1868: Merge "SensorService Flush API bug fix." into klp-dev	2013-10-15 10:07:23 -07:00
surfaceflinger	resolved conflicts for merge of e94d204a to master	2013-10-15 17:22:33 -07:00