OSDN Git Service

Merge "simpleperf: add --show-features option in list cmd." am: 2ad09b2ffd am: 1d5923...
authorYabin Cui <yabinc@google.com>
Mon, 31 Jul 2017 18:22:15 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 18:22:15 +0000 (18:22 +0000)
am: a674895fa2

Change-Id: I92fe0d2772c0c13f55cfff214960487dd442f552


Trivial merge