]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2cb0f6e 71c3ee5)
Merge branch 'master' into honeycomb-release
authorandroid-merger <android-merger@google.com>
Wed, 15 Dec 2010 17:25:02 +0000 (09:25 -0800)
committerandroid-merger <android-merger@google.com>
Wed, 15 Dec 2010 17:25:02 +0000 (09:25 -0800)

Trivial merge
mirror of aapt