]> git.saurik.com Git - android/aapt.git/commitdiff
set up fast-forward from froyo-release to gingerbread
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 Jun 2010 21:34:35 +0000 (14:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 Jun 2010 21:34:35 +0000 (14:34 -0700)
Change-Id: I22fc9465f5d8a0144b31803f431602fe3bda516a


Trivial merge