tree aa5be71bf3c58ac7c3acd101c7073861500f2212
parent 4f3c5589c8cfa797153d50aaff68eaf874048a9c
parent bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb
author Scott Main <smain@google.com> 1283545698 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283545698 -0700

am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error

Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb'

* commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb':
  fix code snippet error