OSDN Git Service

Merge "simpleperf: build cts test running in app context." am: ff972054e9 am: 5710e45719
authorYabin Cui <yabinc@google.com>
Wed, 15 Feb 2017 23:49:23 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Feb 2017 23:49:23 +0000 (23:49 +0000)
am: 11125c7333

Change-Id: I27e1e246e370bf56bbbc74274b3514b0a5546b90


Trivial merge