tree e84ea161a5ba44150ca8348e5babe6097593f20c
parent 46cc4dbb38968dadffcc5f78dd69d391768711e1
parent d3ed45f841419b90e1d6813d9bcefbcb91554a63
author Scott Main <smain@google.com> 1374266038 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374266038 -0700

am d3ed45f8: am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev

* commit 'd3ed45f841419b90e1d6813d9bcefbcb91554a63':
  fix typo in code sample