]> git.saurik.com Git - android/aapt.git/commitdiff
am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to...
authorJean-Baptiste Queru <jbq@google.com>
Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)
* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)


Trivial merge