Scott Main 149d0d4c6f am 1a8a8b73: am 0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag c ... * commit '1a8a8b73d48261384a0f63df894b68db97e7b02c': docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.		2012-02-01 00:18:11 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "fix an issue with vsync event delivery"	2012-01-31 16:46:27 -08:00
libs	aapt now sorts the strings in the resource string pool.	2012-01-31 15:41:30 -08:00
opengl	fix a race condition in eglMakeCurrent()	2012-01-30 18:20:52 -08:00
services/surfaceflinger	Merge "fix an issue with vsync event delivery"	2012-01-31 16:46:27 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00