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: Ic6d24dc5ca8f6dc08cbceb7f06e8365e3cc509ad
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: I20f67f779e82dbccd275319b0182d707408340bf
2014-11-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-11-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-11-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-11-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-11-03merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-11-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-11-01merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-30merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-29merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-28merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-27merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-26merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-25merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-23merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-22merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-21merge in lmp-mr1-release history after reset to ↵The Android Automerger
07dfc73e909810d08aa5b909d71eda3c14d1e237
2014-10-20merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-19merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-18merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-16merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-15merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-14merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-13merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-12merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-11merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-09merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-07merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-10-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
0e4d1e92655d037ed4ddb3eca5360328b3833861
2014-09-30Merge from Chromium at DEPS revision 267aeeb8d85cPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: I665cd5f3cf00ca7782d5114c4c4de9f4645addff
2014-09-22Update makefiles after merge of Chromium at 7b0ec7dd4a37Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I384e21b0491c179f6108839381a480808e03e3a1
2014-09-22Merge third_party/libsrtp from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libsrtp.git at 98284c8600c73812ff4716a6ea157d1e11d417dc This commit was generated by merge_from_chromium.py. Change-Id: I8b474cb15707650e0e2ab4ea5afd07917f18f292
2014-09-22Use FORCE_64BIT_ALIGN on 32-bit platforms to make sure that aes_cbc_ctx_t ↵jiayl@chromium.org
allocated by aes_cbc_alloc is 64-bit aligned. BUG=414919 R=sergeyu@chromium.org Review URL: https://codereview.chromium.org/592173002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@292077 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-22Update makefiles after merge of Chromium at fb34b348eeadAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia1db783fbc6613f541dfdd229907ce8e0588afef
2014-09-19Revert r292047: Replace compiling flag "-O3" with "-O2" to avoid a compiler ↵jiayl@chromium.org
bug that caused a crash TBR=sergeyu@chromium.org BUG=414919 Review URL: https://codereview.chromium.org/588703002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@292049 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-19Replace compiling flag "-O3" with "-O2" to avoid a compiler bug that caused ↵jiayl@chromium.org
a crash. TBR=sergeyu@chromium.org BUG=414919 Review URL: https://codereview.chromium.org/589623002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@292047 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-13Update makefiles after merge of Chromium at 6a4d455b8650Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I1795bb36cd59bc740a3d55d60849561e7e5f1420
2014-09-11Update makefiles after merge of Chromium at b62471bd5180Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I109cfdb89708cb5ccbf5d9fada2be50407a1bebc
2014-09-10Update makefiles after mergeandroid-wear-5.0.0_r1android-l-preview_r2android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-releasel-previewTorne (Richard Coles)
Change-Id: I209c6246ece9f59fd432e427df5717f788d3a3c4
2014-09-10Update makefiles after merge of Chromium at a301aef21f9eAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I31206ce3409533d573a854a6d3f39bc53e1235a7
2014-09-10Update makefiles after merge of Chromium at d0b993bb2548Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I21f94c65259e33f81241d91219d55cfb883fee6f
2014-09-09Update makefiles after merge of Chromium at facf66e09bf8Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Idebb4d45d768674d942fb76b3f0c13339d58192e
2014-09-09Update makefiles after merge of Chromium at 457b0a1c9412Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia5d9d6271f693ea54779045d0e710e407e5f985d
2014-09-05Merge third_party/libsrtp from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libsrtp.git at dcc1fc62771b4f25fa5f91cddec8e9a491d0ee6d This commit was generated by merge_from_chromium.py. Change-Id: I49348face45e38650cfe7adb528cd1fa5e24b2eb
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 00:41:43 +0000