Derek Sollenberger 33e86c7a91 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp ... Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6		2011-07-29 14:16:18 -04:00
..
binder
gui	resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp	2011-07-29 14:16:18 -04:00
pim
private
surfaceflinger	ANativeWindow: add queues-to-window-composer check.	2011-03-08 16:49:51 -08:00
tts
ui	Tweaks for forward-compatibility	2011-06-18 09:42:04 -07:00
utils	DO NOT MERGE. may fix build on some version of gcc	2011-07-27 11:31:57 -07:00