tree c348644bc815c01f8ac3be29b8a24572cc47b901
parent 012375db1e95a5545133f72d8f58ff66ba66f55d
parent a6772271f71672e889776bfe49ec4efd9da036df
author Torne (Richard Coles) <torne@google.com> 1354583935 +0000
committer Torne (Richard Coles) <torne@google.com> 1354583935 +0000

Merge testing/gtest from https://chromium.googlesource.com/external/googletest.git at a6772271f71672e889776bfe49ec4efd9da036df

This commit was generated by merge_from_chromium.py.

Change-Id: I94a313f7505dae35f04f587802c3a911d5ca317b