tree 1a94f1de2264e0aaa7a6e61a86c9319d4c020832
parent 408e663712b7f807ff1a0859c636e2dc4f53422c
parent a6a8ba844cc47ab4eea204115788f050811f9335
author Christopher Tate <ctate@android.com> 1366405247 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366405247 -0700

am a6a8ba84: Merge "Correct a small doc error"

* commit 'a6a8ba844cc47ab4eea204115788f050811f9335':
  Correct a small doc error