From: Ramanan Rajeswaran <ramanan@google.com>
Date: Wed, 7 Mar 2012 23:39:40 +0000 (-0800)
Subject: am 4ec961d5: (-s ours) DO NOT MERGE
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/2ac58f0f8da20ec4af16b08e616c07d8caa93cf2?hp=-c

am 4ec961d5: (-s ours) DO NOT MERGE

* commit '4ec961d5752363161cc78112fbe542b1c0473158':
  DO NOT MERGE
---

2ac58f0f8da20ec4af16b08e616c07d8caa93cf2