tree 97a3022d458b054229db50bd1dd15181b3053165
parent 92e0fd6ce20a111e9ad82b5b252b892e2b971b98
parent 7f3addf37f0aa106507792e8d9eaa3fb6662cdbb
author Scott Main <smain@google.com> 1287192206 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287192206 -0700

am 7f3addf3: am 09da9609: docs: fix code snippet errors

Merge commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb' into gingerbread-plus-aosp

* commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb':
  docs: fix code snippet errors