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

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

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