]> git.saurik.com Git - android/aapt.git/commitdiff
Reconcile with honeycomb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 May 2011 21:33:24 +0000 (14:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 May 2011 21:33:41 +0000 (14:33 -0700)
Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f


Trivial merge