aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 0797b0e5: (-s ours) am 92f488a5: am b4a61987: Merge "Add RTTI support to l...staging/cm-14.0Gilad Arnold2015-08-270-0/+0
|\
| * am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and libgmock_ho...Gilad Arnold2015-08-071-0/+2
| |\
* | | am 830d4aaa: (-s ours) am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley2015-08-270-0/+0
|\| |
| * | am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley2015-07-241-0/+6
| |\ \
* | | | am e9c3b955: (-s ours) am c6c28851: am 211806ad: Merge "Use new sanitizer opt...Christopher Wiley2015-08-270-0/+0
|\| | |
| * | | am c6c28851: am 211806ad: Merge "Use new sanitizer option."Christopher Wiley2015-07-240-0/+0
| |\ \ \
* | | | | am 25c19e6f: (-s ours) resolved conflicts for merge of 62789539 to mnc-dev-pl...Christopher Wiley2015-08-270-0/+0
|\| | | |
| * | | | resolved conflicts for merge of 62789539 to mnc-dev-plus-aospChristopher Wiley2015-07-240-0/+0
| |\ \ \ \
* | | | | | am 1e6be7df: (-s ours) am e36200f7: am 370e17e7: Merge "Initial drop of gmock...Tamas Berghammer2015-08-270-0/+0
|\| | | | |
| * | | | | am e36200f7: am 370e17e7: Merge "Initial drop of gmock 1.7.0"Tamas Berghammer2015-07-050-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and libgmock_ho...Gilad Arnold2015-08-071-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | am b4a61987: Merge "Add RTTI support to libgmock and libgmock_host."Gilad Arnold2015-08-071-0/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge "Add RTTI support to libgmock and libgmock_host."Gilad Arnold2015-08-071-0/+2
| | |\ \ \ \ \
| | | * | | | | Add RTTI support to libgmock and libgmock_host.Gilad Arnold2015-08-061-0/+2
| | |/ / / / /
* | | | | | | am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley2015-07-241-0/+6
|\| | | | | |
| * | | | | | am 7c900060: Merge "Export gmock headers"Christopher Wiley2015-07-241-0/+6
| |\| | | | | | | |_|_|_|/ | |/| | | |
| | * | | | Merge "Export gmock headers"Christopher Wiley2015-07-241-0/+6
| | |\ \ \ \
| | | * | | | Export gmock headersChristopher Wiley2015-07-231-0/+6
* | | | | | | am c6c28851: am 211806ad: Merge "Use new sanitizer option."Christopher Wiley2015-07-240-0/+0
|\| | | | | |
| * | | | | | am 211806ad: Merge "Use new sanitizer option."Christopher Wiley2015-07-241-4/+4
| |\| | | | | | | |_|_|_|/ | |/| | | |
| | * | | | Merge "Use new sanitizer option."Christopher Wiley2015-07-241-4/+4
| | |\| | |
| | | * | | Use new sanitizer option.Dan Albert2015-07-231-4/+4
* | | | | | resolved conflicts for merge of 62789539 to mnc-dr-dev-plus-aospChristopher Wiley2015-07-240-0/+0
|\| | | | |
| * | | | | am 9539beb2: Merge "Tweaks for googlemock."Christopher Wiley2015-07-247-15/+337
| |\| | | | | | |_|_|/ | |/| | |
| | * | | Merge "Tweaks for googlemock."Christopher Wiley2015-07-247-15/+337
| | |\| |
| | | * | Tweaks for googlemock.Tim Kilbourn2015-07-237-15/+337
| | |/ /
* | | / am e36200f7: am 370e17e7: Merge "Initial drop of gmock 1.7.0"Tamas Berghammer2015-07-050-0/+0
|\| | | | |_|/ |/| |
| * | am 370e17e7: Merge "Initial drop of gmock 1.7.0"Tamas Berghammer2015-07-0556-0/+35943
| |\|
* | | Use new sanitizer option.Dan Albert2015-06-161-4/+4
* | | Tweaks for googlemock.Tim Kilbourn2015-05-157-15/+337
* | | keep history after reset to 2996365Baligh Uddin2015-05-140-0/+0
|\| | | |/ |/|
| * Initial empty repositoryBill Yi2015-01-120-0/+0
* Merge "Initial drop of gmock 1.7.0"Tamas Berghammer2015-01-1356-0/+35943
|\
| * Initial drop of gmock 1.7.0Tamas Berghammer2015-01-1356-0/+35943
|/
* Initial empty repositoryBill Yi2015-01-120-0/+0