tree 877265e53f23c6898638daeb36bb4c41e2a05847
parent c3d1dc28fc0908cfc8d412b38521593b45fe1417
parent d16f2f6c3c7c2f899fde35782e1ee978877bb14b
author Jeff McGlynn <jwmcglynn@google.com> 1533697407 -0700
committer Jeff McGlynn <jwmcglynn@google.com> 1533697407 -0700

Merge changes from upstream-master

* Fix build with googletest-1.8.0 and when linking unittests into a
single binary.

Change-Id: I0555fe7d15c28c774f2c4534888829a23f0e5f62