tree 70399a134a8a73242cc714bc3aa06685bb48e0b3
parent aa008b4cb292f67073aa0df98459f2ae4dc8da3a
parent 24e8fa2d0eced3fd314cb39ee31b59add2c00dd2
author Dan Albert <danalbert@google.com> 1519273969 +0000
committer android-build-merger <android-build-merger@google.com> 1519273969 +0000

Merge "Fix NDK gtest name." am: 50b8682dca am: 03af1671d7
am: 24e8fa2d0e

Change-Id: Ifd59e6b8142d99c41537a858a5ca76d57c80ecc3