Mathias Agopian cdd7d8bc14 resolved conflicts for merge of 00aea5c5 to master ... Change-Id: Ie1769be863ee2d411eae451907a928db57882e14		2013-07-12 14:19:10 -07:00
..
powermanager	Power manager now takes calling package name arg.	2013-05-20 16:50:10 -07:00
sensorservice	resolved conflicts for merge of 00aea5c5 to master	2013-07-12 14:19:10 -07:00
surfaceflinger	Merge "Pay attention to buffer timestamps"	2013-07-11 14:40:45 +00:00