]> git.saurik.com Git - android/aapt.git/commitdiff
am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to...
authorJean-Baptiste Queru <jbq@google.com>
Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)
* commit 'dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)


Trivial merge