tree 4865388b3073e1a6c1f119acad4cbe02a9d734f2
parent 34c02173c8695e197869423bcd52fd3837ff29eb
parent 1690c1bca2b7d7e08f1b0f536b6e58a890051546
author Jeff Sharkey <jsharkey@android.com> 1441846410 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441846410 +0000

am 1690c1bc: am 1a20a648: Enable benchmark after trim, when requested.

* commit '1690c1bca2b7d7e08f1b0f536b6e58a890051546':
  Enable benchmark after trim, when requested.