From: Elliott Hughes <enh@google.com>
Date: Thu, 17 Jan 2013 17:02:37 +0000 (+0000)
Subject: Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/0570e6afc60b9adbab880e4a646cf583b47ddec1?hp=17f321193829cfb0d99b4d839d32e8904e013cb1

Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
---