tree 40e8ae16ae61d1683574897d09673247b0766012
parent 8c5cec41e8f6ffa4f21a813c63e6a5ce81b3c334
parent 2d688abd10db1a647c256115217d743d9baf6e67
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)