tree 72f355ad7e7ef180adef3dfe2af9774f74a3ca11
parent 529df378139df0531af312fd7af9159eeab26835
parent da4eb67c40d2827b878677300f4c15a3b059c657
author Jean-Baptiste Queru <jbq@google.com> 1327105821 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327105821 -0800

am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"

* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)