tree c3600574713d8002c66c7665dfb3821ef6fbb2c4
parent b5d70b3a77340046786a9a1d55a98de8a5834b59
parent 74ec2776e822ba7ac72c3b8056c0009a9046fbd2
author Ryan Campbell <ryanjcampbell@google.com> 1488338093 +0000
committer android-build-merger <android-build-merger@google.com> 1488338093 +0000

Merge "Use c and cpp objects for gcov." am: d579b8eb1f am: 425bbada28
am: 74ec2776e8

Change-Id: Ibc591b89c7c674dd9afaa98acff994eec2faa2fd