]> git.saurik.com Git - android/aapt.git/commit
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)
commit6632fea01698b2ae9a8e1d3d584c85431af11c8a
tree781860cd69227842f87cb2cc8c447a072875ba5a
parentf347b212f43c46efa93fc5d5966d38c4763337ee
parent41cc3c51f94f285f376c04fb074950def2c87e7f
am 59073b15: Merge "Fix linux 64 build" into gingerbread

Merge commit '59073b155ab0d8a5706c90200e6af614510aba0e' into gingerbread-plus-aosp

* commit '59073b155ab0d8a5706c90200e6af614510aba0e':
  Fix linux 64 build