]> git.saurik.com Git - android/aapt.git/commitdiff
am 59073b15: Merge "Fix linux 64 build" into gingerbread
authorBrian Carlstrom <bdc@google.com>
Wed, 25 Aug 2010 17:07:18 +0000 (10:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Aug 2010 17:07:18 +0000 (10:07 -0700)
Merge commit '59073b155ab0d8a5706c90200e6af614510aba0e' into gingerbread-plus-aosp

* commit '59073b155ab0d8a5706c90200e6af614510aba0e':
  Fix linux 64 build


Trivial merge