]> git.saurik.com Git - android/aapt.git/commitdiff
merge-ignore changes that were already in or that are not relevant
authorJean-Baptiste Queru <jbq@google.com>
Thu, 16 Jul 2009 20:47:28 +0000 (13:47 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 16 Jul 2009 20:47:28 +0000 (13:47 -0700)
Merge commit '7ecccee0d0c32ee472c9a74f4ccb8b152b074402' into HEAD


Trivial merge