tree 71b9e9812b110db347a1d971623f333818068d98
parent 0293a8a8f4e67784e70303e2813ec9b3d9fb274f
parent 529764ba68dd5573e636e21e812ca1e4774df6b6
author Colin Cross <ccross@android.com> 1462406259 +0000
committer android-build-merger <android-build-merger@google.com> 1462406259 +0000

Merge "Allow libgtest on unbundled builds" am: 55cc0e85b9
am: 529764ba68

* commit '529764ba68dd5573e636e21e812ca1e4774df6b6':
  Allow libgtest on unbundled builds

Change-Id: I9c7138f7f0c7462ede07322710580ae9aa3eece3