From: Brian Carlstrom <bdc@google.com>
Date: Wed, 25 Aug 2010 17:07:18 +0000 (-0700)
Subject: am 59073b15: Merge "Fix linux 64 build" into gingerbread
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/6632fea01698b2ae9a8e1d3d584c85431af11c8a?hp=--cc

am 59073b15: Merge "Fix linux 64 build" into gingerbread

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

* commit '59073b155ab0d8a5706c90200e6af614510aba0e':
  Fix linux 64 build
---

6632fea01698b2ae9a8e1d3d584c85431af11c8a