tree 97e7eff00025887e406358a7c8531604ffb45da9
parent 1190b77dfa16502117b9c80e4fe4c1a64f4acb28
parent 6293affa35ef27f367bd5b27f489d7dfaaf2ed9f
author Dirk Dougherty <ddougherty@google.com> 1352816734 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352816734 -0800

am 6293affa: am e320ac7a: Merge "Doc change: edits to highlights files." into jb-mr1-dev

* commit '6293affa35ef27f367bd5b27f489d7dfaaf2ed9f':
  Doc change: edits to highlights files.