From: Raphaël Moll <ralf@android.com>
Date: Wed, 30 May 2012 22:29:47 +0000 (-0700)
Subject: am e8417384: (-s ours) am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge... 
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/340d52d89027de6cab28e981402de4ea925d7936

am e8417384: (-s ours) am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern." DO NOT MERGE."

* commit 'e8417384e6646c714e48aff3bb603b60458cd8e0':
  Merge "Fix length of pattern." DO NOT MERGE.
---

340d52d89027de6cab28e981402de4ea925d7936