John Wang b62a5356ff am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE ... * commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5': Add getImei() to Phone interface.		2011-07-14 10:49:38 -07:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build	2011-07-13 19:45:44 -04:00
libs	Provide more descriptive name for InputChannel ashmem.	2011-07-13 22:27:37 -07:00
opengl	Merge "Remove the simulator target from all makefiles. Bug: 5010576"	2011-07-12 12:15:07 -07:00
services/surfaceflinger	take the state transform into account with h/w composer hal	2011-07-12 14:51:45 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00