am 9d59c70a: am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo

Merge commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b' into kraken

* commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b':
  doc change: Indicate that only the first 8 characters of the key alias are used.