Go to file
Danielle Millett 79ba73dace am 63faf6c6: (-s ours) am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '63faf6c66ff129da9e431dbafd1170a14aedb259':
  DO NOT MERGE - Cherry picking from master to MR1
2012-01-12 07:33:47 -08:00
cmds Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 2012-01-08 13:19:13 +00:00
include Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 2012-01-08 13:19:13 +00:00
libs Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE 2012-01-09 21:36:22 +00:00
opengl Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 2012-01-08 13:19:13 +00:00
services/surfaceflinger Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 2012-01-08 13:19:13 +00:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00