am 35bb6969: set up fast-forward from froyo-release to gingerbread

Merge commit '35bb69698c173f8b55f24c2bff9d77023ddb5844' into gingerbread-plus-aosp

* commit '35bb69698c173f8b55f24c2bff9d77023ddb5844':
  Fix a regression with lookupKeys that contain special characters