]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 179ee42 6632fea)
am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread
authorBrian Carlstrom <bdc@google.com>
Wed, 25 Aug 2010 17:10:31 +0000 (10:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Aug 2010 17:10:31 +0000 (10:10 -0700)
Merge commit '7517ffd134d03bd5392e8292a18551bfce08ddce'

* commit '7517ffd134d03bd5392e8292a18551bfce08ddce':
  Fix linux 64 build


Trivial merge
mirror of aapt