]> git.saurik.com Git - android/aapt.git/commitdiff
merge from kraken
authorJean-Baptiste Queru <jbq@google.com>
Tue, 6 Apr 2010 23:36:09 +0000 (16:36 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 6 Apr 2010 23:36:09 +0000 (16:36 -0700)
Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0


Trivial merge