OSDN Git Service

Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd052...
authorDan Shi <dshi@google.com>
Fri, 31 Mar 2017 17:24:30 +0000 (17:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 17:24:30 +0000 (17:24 +0000)
commit18d563e947ea781958bba214a9aded3eebce3851
tree1d8dcfb72a98739117a850b603456fd72fd16c46
parentf967996cdbe96b8185967b6ebf423d94244f789e
parent44d8d8876af766b9cbbdb6f190e6f9ef8f7bfbcf
Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205 am: c76a993f79 am: bf837ea212
am: 44d8d8876a

Change-Id: I9b71583490cbde95669fce55ed47bad37579f898