]> git.saurik.com Git - android/aapt.git/commitdiff
am d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc
authorJean-Baptiste Queru <jbq@google.com>
Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)
* commit 'd6b5584b67f8a2f3d8ea20d748652673d5761e33':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)


Trivial merge