tree 7b8e67d019cc065b69a66564c50d4751e33cd065
parent 37a5ecfb84673673ba19893a7dfdb51d8c6406bd
parent fa7860a27ff79b5697ac059c4bedc4f7445500af
author Jean-Baptiste Queru <jbq@google.com> 1326938215 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326938215 -0800

am fa7860a2: Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c

* commit 'fa7860a27ff79b5697ac059c4bedc4f7445500af':
  Rename LOG_ASSERT to ALOG_ASSERT
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
  Rename (IF_)LOG() to (IF_)ALOG()