]> git.saurik.com Git - android/aapt.git/commit
am 5580e44c: Merge "Support changing style parent in overlays"
authorJean-Baptiste Queru <jbq@google.com>
Fri, 5 Nov 2010 21:05:41 +0000 (14:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Nov 2010 21:05:41 +0000 (14:05 -0700)
commit034f2c9aac98c8c5d40667f1bf047211ed8f09f0
treed374f2cf191384381f527fa5b1def34841e4f85c
parent4243979140dd392a9a16d5f787151ac4fa43374c
parentfeea11dc0b8a3ffd908fc6d0a076c8dc575c4de0
am 5580e44c: Merge "Support changing style parent in overlays"

* commit '5580e44c250944f5cd011b2682eea5cc2de9706c':
  Support changing style parent in overlays
ResourceTable.cpp