tree 5af9aa99fd904fb7c4b270bbaed0c788695fa9a6
parent e0aed796f03b080dabae6be0803d4ead1b3260a0
parent b5fb50a133c6fc7fc93d6241912dd9ec24de6ace
author Ying Wang <wangying@google.com> 1263941627 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263941627 -0800

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.