tree 751174aca33f7f555a93127d27036f8869b88997
parent ac5894d4b2946c21c4593a09a36d071280d3cd8b
parent d400e6146b18b12a75d750654b8a118105fd1834
author Scott Main <smain@google.com> 1386023373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386023373 +0000

am d400e614: am 7511d659: am 2dd715ed: Merge "fix FPS typo in JB highlights, reported by vharron" into klp-docs

* commit 'd400e6146b18b12a75d750654b8a118105fd1834':
  fix FPS typo in JB highlights, reported by vharron