From: Ying Wang <wangying@google.com>
Date: Fri, 22 Jan 2010 17:45:31 +0000 (-0800)
Subject: am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/2ff799f0c1a9e168c782f52a13d3e1d1dcd54014?ds=inline;hp=--cc

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.
---

2ff799f0c1a9e168c782f52a13d3e1d1dcd54014