tree cac4d9927683b22c584428d30e4f193bc6fa9333
parent 9a38afd77b52273c925448815cfa2408a8525651
parent cfdd7de171dd8c303056c62b9e9c0840ab1aa6ce
author Tri Vo <trong@google.com> 1509652658 +0000
committer android-build-merger <android-build-merger@google.com> 1509652658 +0000

Merge changes from topic "vts_fuzz_cp" am: 74f5bc1e0d
am: cfdd7de171

Change-Id: I3cb318ca275f9b674dcf47340e2997b3f16c9e7d