]> git.saurik.com Git - android/aapt.git/commitdiff
am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command...
authorXavier Ducrohet <xav@android.com>
Thu, 3 Jan 2013 18:49:28 +0000 (10:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Jan 2013 18:49:28 +0000 (10:49 -0800)
* commit '816fd074cfc32fd3323163dd0c358e249f9cbf56':
  Add single crunch command to aapt. do not merge.


Trivial merge