]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3027503 9171b2f)
am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attribute...
authorYing Wang <wangying@google.com>
Wed, 13 Jan 2010 00:37:31 +0000 (16:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Jan 2010 00:37:31 +0000 (16:37 -0800)
Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d'

* commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.

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

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