From: Raphaël Moll Date: Wed, 30 May 2012 22:25:10 +0000 (-0700) Subject: am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern... X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/a13c191a1bd25ae58ee787e74c9faceb67940bec am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern." DO NOT MERGE." * commit 'ae545bb87c8509c31a72bbc03c0bee7cb23a5133': Merge "Fix length of pattern." DO NOT MERGE. --- a13c191a1bd25ae58ee787e74c9faceb67940bec