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

Merge commit 'bc663a65315e6eab9d92316072250ea9efc9f18a' into eclair-plus-aosp

* commit 'bc663a65315e6eab9d92316072250ea9efc9f18a':
  docs only.