OSDN Git Service

Merge "Add test config to perfprofd_test" am: e0d790c82c
authorDan Shi <dshi@google.com>
Fri, 31 Mar 2017 17:13:26 +0000 (17:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 17:13:26 +0000 (17:13 +0000)
am: 53011202e2

Change-Id: I958abbc2add81e44bc1bde40beb47c18ef98e399


Trivial merge