]> git.saurik.com Git - android/aapt.git/commit
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)
commit296949d70ea4858691461341c0cf32164d666535
tree4ec63e45a298499eb26ca30a602ed4d75b24b8ff
parent179ee42e8a46b04240f38f7baf5887a7d04f6b0a
parent6632fea01698b2ae9a8e1d3d584c85431af11c8a
am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread

Merge commit '7517ffd134d03bd5392e8292a18551bfce08ddce'

* commit '7517ffd134d03bd5392e8292a18551bfce08ddce':
  Fix linux 64 build