am 6fb8880a: Merge change I26a21669 into eclair

Merge commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c' into eclair-mr2

* commit '6fb8880a484e98f4cc8588e8cdf9fee011b0dc7c':
  Set SDK Platform/Doc to API 5.