]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 174b814 034f2c9)
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)
* commit '3442611ee11b2987c83054fe3c7ed5521f27f052':
  Support changing style parent in overlays

1  2 
ResourceTable.cpp patch | diff1 | diff2 | blob | history

diff --cc ResourceTable.cpp
Simple merge
mirror of aapt