]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f68488a 5af23dd)
am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"
authorJean-Baptiste Queru <jbq@google.com>
Wed, 11 Aug 2010 17:07:56 +0000 (10:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Aug 2010 17:07:56 +0000 (10:07 -0700)
Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3'

* commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3':
  Fix build on some linux machines


Trivial merge
mirror of aapt