From: Jean-Baptiste Queru <jbq@google.com>
Date: Sat, 6 Nov 2010 23:25:03 +0000 (-0700)
Subject: am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/8583f5e1725b84c60e501cbc2f579d13ce65a51d

am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"

* commit '3442611ee11b2987c83054fe3c7ed5521f27f052':
  Support changing style parent in overlays
---

8583f5e1725b84c60e501cbc2f579d13ce65a51d