tree 5404962dad68e8a24ca597ed8a6e5a59acc97428
parent 8d6148cd807ea1dcb6f03771086e6a2161bdf9f4
parent 05cd9e00a9c4000467cb8ee5b7acc5fba4417fad
author Nicholas Sauer <nicksauer@google.com> 1401218494 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401218494 +0000

am 05cd9e00: Merge "CTS report MUST not display raw performance numbers. bug:13347703" into klp-dev

* commit '05cd9e00a9c4000467cb8ee5b7acc5fba4417fad':
  CTS report MUST not display raw performance numbers. bug:13347703