am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo

Merge commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken

* commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files