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