tree fc398246f9e9025d77190e05b6998d9ecabf959d
parent d4e936bf93b6405cc8b01fcda6569853d690bfc5
parent db2b39300a8f763cf2d0c9808deb86db87d5492c
author Jean-Baptiste Queru <jbq@google.com> 1327106120 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327106120 -0800

am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"

* commit 'db2b39300a8f763cf2d0c9808deb86db87d5492c':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)