]> git.saurik.com Git - android/aapt.git/commit
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)
commit9cf1eae99dfeb475960ee74d8f010def438769a3
treec1810c49f0bb5578b6bd1d516c4b615a57a9aa46
parent406a85e3379b4ecdd668cb39a386864db2d59e0e
parenta5935dae7b4ebf74f45dec59f9b41b11a664e2bd
merge-ignore changes that were already in or that are not relevant

Merge commit '7ecccee0d0c32ee472c9a74f4ccb8b152b074402' into HEAD