]> git.saurik.com Git - android/aapt.git/commitdiff
reconcile korg/master into goog/master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)

Trivial merge