aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-09-12Merge "Disable the legacy gmock." am: f08eab13dd am: 07fc9d5419 am: 82aa94d19bstudio-3.1.2studio-3.0studio-2.3gradle_3.1.2gradle_3.0.0gradle_2.3.0studio-master-devDan Albert
2016-09-12Merge "Disable the legacy gmock." am: f08eab13dd am: 07fc9d5419Dan Albert
2016-09-12Merge "Disable the legacy gmock." am: f08eab13ddDan Albert
2016-09-12Merge "Disable the legacy gmock."Dan Albert
2016-09-12Merge "Disable the legacy gmock."HEADandroid-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4nougat-iot-releasen-iot-preview-4mastermainTreehugger Robot
2016-09-08Disable the legacy gmock.Dan Albert
2016-07-27Merge \\\\"Convert Android.mk to Android.bp\\\\" am: f47bfd7f77 am: 2e692fb5c...Dan Willemsen
2016-07-27Merge \\\"Convert Android.mk to Android.bp\\\" am: f47bfd7f77 am: 2e692fb5c3Dan Willemsen
2016-07-27Merge \\"Convert Android.mk to Android.bp\\" am: f47bfd7f77Dan Willemsen
2016-07-27Merge \"Convert Android.mk to Android.bp\"Dan Willemsen
2016-07-27Merge "Convert Android.mk to Android.bp"Dan Willemsen
2016-07-25Convert Android.mk to Android.bpDan Willemsen
2016-07-23Support gmock for Windows. am: a78d46728dElliott Hughes
2016-07-23Support gmock for Windows.Elliott Hughes
2016-07-22Support gmock for Windows.android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseElliott Hughes
2016-07-22Merge \\\\"Support gmock for Windows.\\\\" am: dbda419424 am: 0d5099e3a7 am: ...Elliott Hughes
2016-07-22Merge \\\"Support gmock for Windows.\\\" am: dbda419424 am: 0d5099e3a7Elliott Hughes
2016-07-22Merge \\"Support gmock for Windows.\\" am: dbda419424Elliott Hughes
2016-07-22Merge \"Support gmock for Windows.\"Elliott Hughes
2016-07-22Merge "Support gmock for Windows."Treehugger Robot
2016-07-22Support gmock for Windows.Elliott Hughes
2016-05-10Merge "Fix google-explicit-constructor warnings." am: f68c7ea3c4 am: 7c0e9cc0...Chih-hung Hsieh
2016-05-10Merge "Fix google-explicit-constructor warnings." am: f68c7ea3c4 am: 7c0e9cc0a7Chih-Hung Hsieh
2016-05-10Merge "Fix google-explicit-constructor warnings." am: f68c7ea3c4Chih-hung Hsieh
2016-05-10Merge "Fix google-explicit-constructor warnings."Chih-Hung Hsieh
2016-05-10Merge "Fix google-explicit-constructor warnings."android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Chih-hung Hsieh
2016-05-06Fix google-explicit-constructor warnings.Chih-Hung Hsieh
2016-02-23Merge "external/gmock: Silence warnings by using the correct LOCAL_CFLAGS."android-n-preview-2android-n-preview-1James Hawkins
2016-02-22external/gmock: Silence warnings by using the correct LOCAL_CFLAGS.James Hawkins
2015-08-27am 0797b0e5: (-s ours) am 92f488a5: am b4a61987: Merge "Add RTTI support to l...studio-master-dev_before_27917934studio-master-dev_before_26911779studio-2.0-rc1studio-2.0studio-1.5gradle_2.0.0gradle_1.5.0android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-releasebrillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m10-releasebrillo-m10-devGilad Arnold
2015-08-27am 830d4aaa: (-s ours) am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley
2015-08-27am e9c3b955: (-s ours) am c6c28851: am 211806ad: Merge "Use new sanitizer opt...Christopher Wiley
2015-08-27am 25c19e6f: (-s ours) resolved conflicts for merge of 62789539 to mnc-dev-pl...Christopher Wiley
2015-08-27am 1e6be7df: (-s ours) am e36200f7: am 370e17e7: Merge "Initial drop of gmock...Tamas Berghammer
2015-08-07am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and libgmock_ho...brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devGilad Arnold
2015-08-07am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and libgmock_ho...studio-1.4Gilad Arnold
2015-08-07am b4a61987: Merge "Add RTTI support to libgmock and libgmock_host."Gilad Arnold
2015-08-07Merge "Add RTTI support to libgmock and libgmock_host."Gilad Arnold
2015-08-06Add RTTI support to libgmock and libgmock_host.Gilad Arnold
2015-07-24am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley
2015-07-24am c6c28851: am 211806ad: Merge "Use new sanitizer option."Christopher Wiley
2015-07-24resolved conflicts for merge of 62789539 to mnc-dev-plus-aospChristopher Wiley
2015-07-24am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley
2015-07-24am c6c28851: am 211806ad: Merge "Use new sanitizer option."Christopher Wiley
2015-07-24resolved conflicts for merge of 62789539 to mnc-dr-dev-plus-aospChristopher Wiley
2015-07-24am 7c900060: Merge "Export gmock headers"Christopher Wiley
2015-07-24am 211806ad: Merge "Use new sanitizer option."Christopher Wiley
2015-07-24am 9539beb2: Merge "Tweaks for googlemock."Christopher Wiley
2015-07-24Merge "Export gmock headers"Christopher Wiley
2015-07-24Merge "Use new sanitizer option."Christopher Wiley
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 11:19:13 +0000