tree 283f6f9cc21f58ad8e5f83dd79fe918fe1cc502f
parent 4dd1cec48d365609612be74c0665805d300b7299
parent 2a1e6a69a7713d588769693df96a7b8f2a6438c3
author John Spurlock <jspurlock@google.com> 1352419112 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352419112 -0800

am 2a1e6a69: am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..."

* commit '2a1e6a69a7713d588769693df96a7b8f2a6438c3':
  Address comments from merged "Fix remaining jank in sec..."