summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-09merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-cts-releaseThe Android Automerger
2014-12-08Merge from Chromium at DEPS revision 39.0.2171.95android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devBen Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ie8322cf9b80cce0537ab2f0dda42eb304fe28f87
2014-12-08Update makefiles after merge of Chromium at 39.0.2171.95Ben Murdoch
This commit was generated by merge_from_chromium.py. Change-Id: I7d508dc2f6277f5e10d088d7b24cbd5a8af1ae03
2014-12-08Merge third_party/webrtc from ↵Ben Murdoch
https://chromium.googlesource.com/a/external/webrtc/stable/webrtc.git at 33e74211aee74a1cde7968e646c59ba98337ea2a This commit was generated by merge_from_chromium.py. Change-Id: Ifdef209484f2547f7534ed54c2f52d7719c5a091
2014-12-02Merge 7729 "Build fix for MIPS Android Webview build."andrew@webrtc.org
> Build fix for MIPS Android Webview build. > > Excluding optimizations to support MIPS32R6 platform for Android Webview build (see also https://code.google.com/p/webrtc/source/detail?r=7580). > > R=andrew@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/32459004 TBR=ljubomir.papuga@gmail.com BUG=chromium:438351 Review URL: https://webrtc-codereview.appspot.com/27329004 git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7786 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-02Merge 7343 "Changed mips_arch_variant variable value correspondi..."andrew@webrtc.org
> Changed mips_arch_variant variable value corresponding to Chromium code changes. > > Chromium commit URL: https://crrev.com/c8a5da7455b57b2399e4a69e8100c098d9870052 > > R=andrew@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/23809004 > > Patch from Ljubomir Papuga <lpapuga@mips.com>. TBR=ljubomir.papuga@gmail.com BUG=chromium:438351 Review URL: https://webrtc-codereview.appspot.com/32279004 git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7785 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-02Merge 7580 "Build fix for MIPS32R6."andrew@webrtc.org
> Build fix for MIPS32R6. > > Exclude MIPS optimizations for MIPS32R6 build since some of the instructions > are not supported. This is temporary fix, until the MIPS32R6 code is added. > > R=andrew@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/25989004 > > Patch from Ljubomir Papuga <lpapuga@mips.com>. TBR=lpapuga@mips.com BUG=chromium:438351 Review URL: https://webrtc-codereview.appspot.com/31079004 git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7784 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
3216ca840696de7c7d69b7e10ca6f2bdb592ff47
2014-11-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
3216ca840696de7c7d69b7e10ca6f2bdb592ff47
2014-11-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
3216ca840696de7c7d69b7e10ca6f2bdb592ff47
2014-11-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
3216ca840696de7c7d69b7e10ca6f2bdb592ff47
2014-11-03merge in lmp-mr1-release history after reset to ↵The Android Automerger
3216ca840696de7c7d69b7e10ca6f2bdb592ff47
2014-11-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
3216ca840696de7c7d69b7e10ca6f2bdb592ff47
2014-11-01merge in lmp-mr1-release history after reset to ↵The Android Automerger
3216ca840696de7c7d69b7e10ca6f2bdb592ff47
2014-10-30merge in lmp-mr1-release history after reset to ↵The Android Automerger
3216ca840696de7c7d69b7e10ca6f2bdb592ff47
2014-10-29Merge from Chromium at DEPS revision 39.0.2171.44Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I02f051e689b01973d19895b2b500af1e74b9e9ba
2014-10-29Update makefiles after merge of Chromium at 39.0.2171.44Ben Murdoch
This commit was generated by merge_from_chromium.py. Change-Id: I5c3566d504f0e795ef5518262dfd5148387a68d3
2014-10-29Merge third_party/webrtc from ↵Ben Murdoch
https://chromium.googlesource.com/a/external/webrtc/stable/webrtc.git at 26a0c4c9568f9e616e9e9fa8652911ddd1f1f70a This commit was generated by merge_from_chromium.py. Change-Id: I3ebdc4c1beb90e1938d1646637e59ae4f3bc2b71
2014-10-29merge in lmp-mr1-release history after reset to ↵The Android Automerger
d54f2f8551264b78fcfe4e38c6631f80aeb1c88a
2014-10-28merge in lmp-mr1-release history after reset to ↵The Android Automerger
d54f2f8551264b78fcfe4e38c6631f80aeb1c88a
2014-10-27Merge r7418 to 39 branchtnakamura@webrtc.org
BUG=chromium:415935 TBR=xians Review URL: https://webrtc-codereview.appspot.com/29979004 git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7533 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-27merge in lmp-mr1-release history after reset to ↵The Android Automerger
d54f2f8551264b78fcfe4e38c6631f80aeb1c88a
2014-10-26merge in lmp-mr1-release history after reset to ↵The Android Automerger
d54f2f8551264b78fcfe4e38c6631f80aeb1c88a
2014-10-25merge in lmp-mr1-release history after reset to ↵The Android Automerger
d54f2f8551264b78fcfe4e38c6631f80aeb1c88a
2014-10-23merge in lmp-mr1-release history after reset to ↵The Android Automerger
d54f2f8551264b78fcfe4e38c6631f80aeb1c88a
2014-10-22merge in lmp-mr1-release history after reset to ↵The Android Automerger
d54f2f8551264b78fcfe4e38c6631f80aeb1c88a
2014-10-21merge in lmp-mr1-release history after reset to ↵The Android Automerger
d54f2f8551264b78fcfe4e38c6631f80aeb1c88a
2014-10-20merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-19merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-18merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-16merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-15merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-14merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-14Merge from Chromium at DEPS revision 39.0.2171.26Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I90f1e1916435bed20b57f031468b55da8db2092b
2014-10-14Update makefiles after merge of Chromium at 39.0.2171.26Torne (Richard Coles)
This commit was generated by merge_from_chromium.py. Change-Id: Ieeacceb079ec9a3274cb535aa553687a7f48570c
2014-10-14Merge third_party/webrtc from ↵Torne (Richard Coles)
https://chromium.googlesource.com/a/external/webrtc/stable/webrtc.git at 102e8974ff5b0bea642178e580076bf541841f9a This commit was generated by merge_from_chromium.py. Change-Id: Icb4e2ba2c733a7abd5b78be9be303d7742696695
2014-10-13merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-12merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-11merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-09merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-07merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-06Merge webrtc r7310 to M39.jiayl@webrtc.org
TBR=pbos@webrtc.org BUG=420753 Review URL: https://webrtc-codereview.appspot.com/29689004 git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7376 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-06Merge webrtc r7301 to M39 branch. jiayl@webrtc.org
TBR=juberti@webrtc.org BUG=414211 Review URL: https://webrtc-codereview.appspot.com/29679004 git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7375 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-10-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
0dff1ec4f4b73f56bdea3ce62ce841bb8aeabb68
2014-09-30Create WebRTC branch 39 from trunk@7296tnakamura@webrtc.org
git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7345 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-30Merge from Chromium at DEPS revision 267aeeb8d85cPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: I64db0e7da49b895ed7379626b7d7abbe995d21f0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 06:02:25 +0000