]> git.saurik.com Git - android/aapt.git/commit
am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
authorXavier Ducrohet <xav@android.com>
Thu, 21 Jul 2011 00:18:04 +0000 (17:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Jul 2011 00:18:04 +0000 (17:18 -0700)
commit072955603b0377ecc22fecdfcae6acbde773c0c5
treeb61c74f847cefb3f8baf9cea87b38980c65baf62
parent0150a07c6a9b14de684d129d369ac995f7b3f4b3
parent82cf0eaeddd1f87bf54db24d3f84856a679e53a4
am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

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