OSDN Git Service

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

Change-Id: I8b67c6167d1d70f6a9806069f705a2e7f4b8ac47


Trivial merge