]> git.saurik.com Git - android/aapt.git/commitdiff
am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to...
authorJean-Baptiste Queru <jbq@google.com>
Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)
* commit '45470559cd4a499fd5d38cf708f0b531dc081fed':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)


Trivial merge