]> git.saurik.com Git - android/aapt.git/commit
am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern...
authorRaphaël Moll <ralf@android.com>
Wed, 30 May 2012 22:25:10 +0000 (15:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 May 2012 22:25:10 +0000 (15:25 -0700)
commita13c191a1bd25ae58ee787e74c9faceb67940bec
treed97d9b72ad2aa3776ed4a2fd374840c5de3f9589
parent1ae71b737237659d84b7564de9dcc182f98c98de
parent8be9f9e93371403dc056f1b13f8b93ff3863eaad
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.