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

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

Merge commit '7517ffd134d03bd5392e8292a18551bfce08ddce'

* commit '7517ffd134d03bd5392e8292a18551bfce08ddce':
  Fix linux 64 build
---

296949d70ea4858691461341c0cf32164d666535