]> git.saurik.com Git - android/aapt.git/commitdiff
Merge branch 'cupcake'
authorandroid-build SharedAccount <android-build@undroid16.corp.google.com>
Fri, 16 Jan 2009 00:16:01 +0000 (16:16 -0800)
committerandroid-build SharedAccount <android-build@undroid16.corp.google.com>
Fri, 16 Jan 2009 00:16:01 +0000 (16:16 -0800)

Trivial merge