]> git.saurik.com Git - android/aapt.git/commit
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)
commit195639b7fb2fd4796a560e12ddd4e8156f2a187a
treeddca8b63d86ca2a9c6af5f0226fb749d48552fa0
parent9171b2f37058b37bf08464cb67286dd2e503c89a
parent87e7a47ba1e96211bc7f5a440ccedc9d0ab516c2
am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair

Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp

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