am 9d6704f9: am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk

Merge commit '9d6704f9f1d078f066fb8f5568179fd0743de406' into eclair-mr2-plus-aosp

* commit '9d6704f9f1d078f066fb8f5568179fd0743de406':
  docs: misc edits to samples page and intro docs