]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96561fe 195639b)
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)
Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c'

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

1  2 
Resource.cpp patch | diff1 | diff2 | blob | history

diff --cc Resource.cpp
Simple merge
mirror of aapt