]> git.saurik.com Git - android/aapt.git/commit
am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"
authorJean-Baptiste Queru <jbq@google.com>
Sat, 6 Nov 2010 23:25:03 +0000 (16:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 6 Nov 2010 23:25:03 +0000 (16:25 -0700)
commit8583f5e1725b84c60e501cbc2f579d13ce65a51d
treeed36bc305e28b452977d4de710e2fc403ede2664
parent174b814c17a1d3e80534db7949b6f49b51756128
parent034f2c9aac98c8c5d40667f1bf047211ed8f09f0
am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"

* commit '3442611ee11b2987c83054fe3c7ed5521f27f052':
  Support changing style parent in overlays
ResourceTable.cpp