]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9171b2f 87e7a47)
am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options...
authorYing Wang <wangying@google.com>
Tue, 19 Jan 2010 22:53:47 +0000 (14:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Jan 2010 22:53:47 +0000 (14:53 -0800)
Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp

* commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
  Add instrumentation as a source tag for proguard keep options.


Trivial merge
mirror of aapt