]> git.saurik.com Git - android/aapt.git/commitdiff
am e8417384: (-s ours) am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge...
authorRaphaël Moll <ralf@android.com>
Wed, 30 May 2012 22:29:47 +0000 (15:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 May 2012 22:29:47 +0000 (15:29 -0700)
* commit 'e8417384e6646c714e48aff3bb603b60458cd8e0':
  Merge "Fix length of pattern." DO NOT MERGE.


Trivial merge