tree beb8e43ed3449d347795f09f37c63e46632d03bc
parent 68925c535932b7cbb8aafb4f981f23ef2887a1c4
parent 279302ea0d563fb918c02ac75d8a6c743f91dcb6
author The Android Open Source Project <initial-contribution@android.com> 1277847293 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1277847293 -0700

set up fast-forward from froyo-release to gingerbread

Change-Id: Ib51715745e382bdc0cb3130afed110a6307b7059