tree ff3521098d66ae13e9e5d9b31f214e552ff65d31
parent ad48884579b86b65ff97ca62055051ecba6a2a32
parent 53011202e2e0b10cdc78c17cc152a9c2d5817438
author Dan Shi <dshi@google.com> 1490980406 +0000
committer android-build-merger <android-build-merger@google.com> 1490980406 +0000

Merge "Add test config to perfprofd_test" am: e0d790c82c
am: 53011202e2

Change-Id: I958abbc2add81e44bc1bde40beb47c18ef98e399