am 528954c4: docs only. fix sample code errors per bug 2115299

Merge commit '528954c4d63980c0515528624130477f921cbc60' into eclair

* commit '528954c4d63980c0515528624130477f921cbc60':
  docs only.