tree 271aac9e655c1c0fbf603a16e214c8dbb237ca97
parent 6d001c0f7a7659d456012c220aed14a891a20a83
parent 3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c
author Ying Wang <wangying@google.com> 1264182331 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264182331 -0800

am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair

Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c'

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