Marco Nelissen 50fc325854 Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."		2011-10-19 07:50:24 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0	2011-10-18 23:00:08 -07:00
libs	am 9a0732af: Merge "SensorManager reconnects to sensor service when the later dies" into ics-mr0	2011-10-17 15:52:31 -07:00
opengl	don't log EGL errors due to unimplemented proprietary extensions	2011-10-05 19:15:32 -07:00
services/surfaceflinger	am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0	2011-10-18 23:00:08 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00