cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo

Conflicts:

	docs/html/sdk/installing.jd

Change-Id: Id43ad8c62039099bb518722bb8694dcf8ba6dfa6
25 files changed