tree d1c6eb3172d852ca2e0f0afee71e08b2e0363fd7
parent d21b89db1edbfe798d7da477f949f5a8eb3a5578
parent abffc7f7a8c61a4e0202e9398e4d1565408a1ada
author Jean-Baptiste Queru <jbq@google.com> 1327103521 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327103521 -0800

am abffc7f7: (-s ours) am fa7860a2: Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c

* commit 'abffc7f7a8c61a4e0202e9398e4d1565408a1ada':
  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()