Go to file
Justin Ho 7ef6ae3b9b am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
2012-01-23 15:13:19 -08:00
cmds Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 2012-01-19 14:45:03 -08:00
include Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) 2012-01-19 14:44:56 -08:00
libs Rename LOG_ASSERT to ALOG_ASSERT 2012-01-19 14:45:08 -08:00
opengl Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 2012-01-19 14:45:03 -08:00
services/surfaceflinger Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 2012-01-19 14:45:03 -08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00