From: Xavier Ducrohet <xav@android.com>
Date: Thu, 21 Jul 2011 00:18:04 +0000 (-0700)
Subject: am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/072955603b0377ecc22fecdfcae6acbde773c0c5?ds=sidebyside

am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

* commit 'a125c937de06b1cc43368743592f47513eb88b76':
  Add generation of dependency file for .ap_ package
---

072955603b0377ecc22fecdfcae6acbde773c0c5