]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 485362d 22eef02)
am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread
authorYing Wang <wangying@google.com>
Fri, 13 Aug 2010 22:29:04 +0000 (15:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Aug 2010 22:29:04 +0000 (15:29 -0700)
Merge commit 'e05184f271f9882a5bf828e353aea40e0c06ff69' into gingerbread-plus-aosp

* commit 'e05184f271f9882a5bf828e353aea40e0c06ff69':
  Output proguard keep flags for fragment classes.


Trivial merge
mirror of aapt