am 59e644e3: doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master

Merge commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4' into froyo-plus-aosp

* commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4':
  doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master