am 90b35770: Merge change If922a88c into eclair

Merge commit '90b35770c227f9b4ad56194de627593496acf724' into eclair-plus-aosp

* commit '90b35770c227f9b4ad56194de627593496acf724':
  Update version name to 2.1 and API to 7.