OSDN Git Service

am c09eacf6: (-s ours) Merge changes Ib10d1000,Ibc332506,Ib429c9b5,I9a87ab49,I948ff132
authorJean-Baptiste Queru <jbq@google.com>
Wed, 18 Jan 2012 20:30:18 +0000 (12:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Jan 2012 20:30:18 +0000 (12:30 -0800)
* commit 'c09eacf62df8ab605a07a078258b31cc5caf9019':
  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 LOGV(_IF) to ALOGV(_IF)


Trivial merge