]> git.saurik.com Git - android/aapt.git/commit
am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard...
authorYing Wang <wangying@google.com>
Fri, 22 Jan 2010 17:45:31 +0000 (09:45 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Jan 2010 17:45:31 +0000 (09:45 -0800)
commit2ff799f0c1a9e168c782f52a13d3e1d1dcd54014
treed201e661aa4703ef7093ce7edd324e30a1a0020f
parent96561feade39d880a45c8d17486156287f7e619d
parent195639b7fb2fd4796a560e12ddd4e8156f2a187a
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.
Resource.cpp