tree 58b792e4751b6974bc11a5eac15c8b4c52880ff1
parent 5d7f6e614e7ead1fbe40a6886f78c31809bcbd40
parent 71beeab14a891297b6658c4aeb47557083091aa1
author The Android Open Source Project <initial-contribution@android.com> 1277847275 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1277847275 -0700

set up fast-forward from froyo-release to gingerbread

Change-Id: I22fc9465f5d8a0144b31803f431602fe3bda516a