tree 6bac7564df581a9b930273c163da4a7c377f9bf7
parent 3986e52cf994ea7960dabffb8d6015e400ce3b63
parent 21de5f3f12071458c2a1cf3dd39bb9271ee13e92
author smain@google.com <smain@google.com> 1413841233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413841233 +0000

am 21de5f3f: Doc change: misc changes to highlights.

* commit '21de5f3f12071458c2a1cf3dd39bb9271ee13e92':
  Doc change: misc changes to highlights.