tree 6f7ba5482799a2e263e437fde12d5cf1f0d33d88
parent 9eb32c96c872512c8aedc8627a4b96e9ea2a1a28
parent 2b136832be7326caed0c79bae418c2dd54372bea
author Scott Main <smain@google.com> 1283545108 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283545108 -0700

am 2b136832: am c4367e54: fix code snippet error

Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp

* commit '2b136832be7326caed0c79bae418c2dd54372bea':
  fix code snippet error