]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2db8b02 6dfccf0)
am ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto-add-overlay option to aapt...
authorXavier Ducrohet <xav@google.com>
Sat, 13 Feb 2010 01:55:17 +0000 (17:55 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 13 Feb 2010 01:55:17 +0000 (17:55 -0800)
Merge commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4'

* commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4':
  Add --auto-add-overlay option to aapt. DO NOT MERGE


Trivial merge
mirror of aapt