tree 0f700d310ee31030c3bd208482bad438eb3b75f3
parent 4f5d3e1f30bddd99baac93f7e384f2c0c0a03a03
parent 02dbc20df08466f1a6b90925d515870282a8ba9c
author Jonathan Basseri <misterikkit@google.com> 1505847341 +0000
committer android-build-merger <android-build-merger@google.com> 1505847341 +0000

Merge "Support -c and -m for GTEST." am: 85578a8515
am: 02dbc20df0

Change-Id: I8151028f99c05f340aa491357811e05a875fed2d