aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 06eefd491e -s ours am: ↵Xin Li
e0c0a69dbc -s ours am: 260749e1fc -s ours am skip reason: Change-Id I55ebd388b44a5ece4e0949be265d0d51a21cbe61 with SHA-1 72275a7808 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12796484 Change-Id: If62277c09488460330181473fbeb63d36ddfda7e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 06eefd491e -s ours am: ↵Xin Li
e0c0a69dbc -s ours am skip reason: Change-Id I55ebd388b44a5ece4e0949be265d0d51a21cbe61 with SHA-1 72275a7808 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12796484 Change-Id: I1628904578b087f58f140af5b04191d56152a9ee
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 06eefd491e -s oursXin Li
am skip reason: Change-Id I55ebd388b44a5ece4e0949be265d0d51a21cbe61 with SHA-1 72275a7808 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12796484 Change-Id: I89f70a03450b6dfebcaf9eb0d13d9df4313a7fe0
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I55ebd388b44a5ece4e0949be265d0d51a21cbe61 Change-Id: I32548d00df99268f15fe44c792a086d880335c30
2020-09-16[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 am: deaba6eac3 -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 1ff51e3198 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: Id3f6972f5c072fd45e49fbc9bd6db6b1e6cde10b
2020-09-14Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 9da94763f7waynema
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: Ie8df9a19b52ad9afb61ad26da796809b8174bab0
2020-09-11[automerger skipped] Merge "Merge Android R" am: 43e6f74c3d -s ours am: ↵Xin Li
3739a9643a -s ours am: 8189e71d2c -s ours am: 4f3b706921 -s ours am: e0e7c00b69 -s ours am skip reason: Change-Id Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1 with SHA-1 1d2f56b4cb is in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1422385 Change-Id: I818ec2cf5c56ac0d41c0c9f51c4da7973f69374e
2020-09-11[automerger skipped] Merge "Merge Android R" am: 43e6f74c3d -s ours am: ↵Xin Li
3739a9643a -s ours am: 8189e71d2c -s ours am: 4f3b706921 -s ours am skip reason: Change-Id Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1 with SHA-1 1d2f56b4cb is in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1422385 Change-Id: I9ae6430505f1e4cbff5677644223b1cc5ff47deb
2020-09-11[automerger skipped] Merge "Merge Android R" am: 43e6f74c3d -s ours am: ↵Xin Li
3739a9643a -s ours am: 8189e71d2c -s ours am skip reason: Change-Id Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1 with SHA-1 1d2f56b4cb is in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1422385 Change-Id: Ie6375ccd3d736d995e6ebeed4cab78d77ef19fcc
2020-09-11[automerger skipped] Merge "Merge Android R" am: 43e6f74c3d -s ours am: ↵Xin Li
3739a9643a -s ours am skip reason: Change-Id Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1 with SHA-1 1d2f56b4cb is in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1422385 Change-Id: Ie3726462402a1bd180bfc2b98c0fc46ae219f47a
2020-09-11[automerger skipped] Merge "Merge Android R" am: 43e6f74c3d -s oursXin Li
am skip reason: Change-Id Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1 with SHA-1 1d2f56b4cb is in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1422385 Change-Id: I11f0b2ab997289080ef039424d64de0d50161d40
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1 Change-Id: I2c5467ae16e6293c0186489239e743e6a5c3a079
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 1d2f56b4cb -s ours am: 2a1b067d51 -s ours am: ee6c723b44 -s ours am: 97d6e72bed -s ours am skip reason: Change-Id Ie49f7039a3c1e5c953688a4c9d6534af6bc45f20 with SHA-1 1464c19046 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12470184 Change-Id: I7877140c4b0dab72a553b490790cec91f6d4d118
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 1d2f56b4cb -s ours am: 2a1b067d51 -s ours am: ee6c723b44 -s ours am skip reason: Change-Id Ie49f7039a3c1e5c953688a4c9d6534af6bc45f20 with SHA-1 1464c19046 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12470184 Change-Id: I756d76cebb3d1a4c3bdb08a5e8f39b8006410b83
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 1d2f56b4cb -s ours am: 2a1b067d51 -s ours am skip reason: Change-Id Ie49f7039a3c1e5c953688a4c9d6534af6bc45f20 with SHA-1 1464c19046 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12470184 Change-Id: I58cb2c45a92c6e9e8afda734c69546b7cde4a59d
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 1d2f56b4cb -s ours am skip reason: Change-Id Ie49f7039a3c1e5c953688a4c9d6534af6bc45f20 with SHA-1 1464c19046 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12470184 Change-Id: Ie14c0eccd5bf031d1f7a3e24d4e88feb402b5728
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ie49f7039a3c1e5c953688a4c9d6534af6bc45f20 Change-Id: Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 am: 5c7c7ddfd6 am: b8cde20ed4 -s ours am: e0347a1c6e -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 1ff51e3198 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: I919fd227b46d3ab3ce314ba16878b11f30b7e93b
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 am: 5c7c7ddfd6 am: b8cde20ed4 -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 1ff51e3198 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: If8144737befe52aaf06acd10ccf9bec6b628c346
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 am: 5c7c7ddfd6 -s ours am: 72275a7808 -s ours am: 540944cf7a -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 1ff51e3198 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: I69ae40a03208a0b14738fc415f8401b6f18ba820
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 -s ours am: 1464c19046 -s ours am: cd504eed8f -s ours am: fa70fb1a78 -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 f804e546ba is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: I0616a2e542c8b0c28b711a16032f6ccd0c60c285
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 am: 5c7c7ddfd6 -s ours am: 72275a7808 -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 1ff51e3198 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: I6c61a59332b14edb7d9449d4985c338f78e5cecf
2020-07-14Make libprotobuf-cpp-full buildable for native_bridge am: 1ff51e3198 am: ↵android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr2-releaseandroid11-qpr1-c-releaseVictor Khimenko
5c7c7ddfd6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: Ia0adc3fea34b94455ddb5cdb6f54ebd753e1a1ab
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 -s ours am: 1464c19046 -s ours am: cd504eed8f -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 f804e546ba is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: Id22605723a005a0d3d613ada9fe4151cdbfe2401
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 am: 5c7c7ddfd6 -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 1ff51e3198 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: I55ebd388b44a5ece4e0949be265d0d51a21cbe61
2020-07-14Make libprotobuf-cpp-full buildable for native_bridge am: 1ff51e3198android-11.0.0_r16android11-d1-b-releaseVictor Khimenko
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: Icf73bf45de700cb5f1fd39fdcc95df961a189f7e
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 -s ours am: 1464c19046 -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 f804e546ba is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: If601e7adeef7b6ef7315b306b7b271cee2242838
2020-07-14Make libprotobuf-cpp-full buildable for native_bridge am: 1ff51e3198android-mainline-11.0.0_r35Victor Khimenko
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: Id577591801a8f267201343cc5e6555275bd27984
2020-07-14[automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko
am: 1ff51e3198 -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 f804e546ba is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: Ie49f7039a3c1e5c953688a4c9d6534af6bc45f20
2020-07-10Make libprotobuf-cpp-full buildable for native_bridgeandroid11-devVictor Khimenko
Bug: http://b/153609531 Test: m libprotobuf-cpp-full.native_bridge Change-Id: Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 Merged-In: Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4
2020-07-03Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd ↵Victor Khimenko
am: f4089a6108 am: 4f368633bb am: 06b4cb58e7 am: 3c22f7a205 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1354625 Change-Id: I196ab77a6d1212e9b8185bb75648198e00d482a5
2020-07-03Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd ↵Victor Khimenko
am: f4089a6108 am: 4f368633bb am: 06b4cb58e7 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1354625 Change-Id: I6baa92dcd360c103c345d635f824cd80bbe40ec1
2020-07-03Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd ↵Victor Khimenko
am: f4089a6108 am: 4f368633bb Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1354625 Change-Id: I9c8929036314c239bfac2e42667d16d28564f015
2020-07-03Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd ↵Victor Khimenko
am: f4089a6108 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1354625 Change-Id: I282493aaa7d4f9eaa89dca11250420bf9eae9d27
2020-07-03Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fdVictor Khimenko
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1354625 Change-Id: I0d00d525f1e94fefaf4ad7158089b1be42c004b9
2020-07-03Merge "Make libprotobuf-cpp-full buildable for native_bridge"android-r-beta-3android-r-beta-2Victor Khimenko
2020-07-02Make libprotobuf-cpp-full buildable for native_bridgeVictor Khimenko
Bug: http://b/153609531 Test: m libprotobuf-cpp-full.native_bridge Change-Id: Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 268feccbed ↵waynema
am: 2751ea237b am: 46a61a9134 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: I4f294b48289fe7c1339a750d2e1d61cd7d71e528
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 004f78b646 ↵waynema
am: ad7fb5cd1d am: dce8b91fb9 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: I6a57cc740bfc4ba749c9a65da66cdeaca1c8ed76
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 268feccbed ↵waynema
am: d1931e662c am: 6cfb7d9be8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: I99fe1ae9c3178cb7283619c5e4121c6a924d42c9
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 268feccbed ↵waynema
am: 2751ea237b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: Ieb809f476a6bc1be1668e4d7bd159fc05a800a9d
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 004f78b646 ↵waynema
am: ad7fb5cd1d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: I89261f92a2dc5d99035d248aad1a0022b7d76da5
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 268feccbed ↵waynema
am: d1931e662c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: Ia88ffe6eb6ebe0fce1650eb314f7cffdc1a96244
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 268feccbedwaynema
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: I020310a36aeb2719bcbb86522d8041853cfbec59
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 004f78b646waynema
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: I9f797c784ce2a5d9b3c2f29b74b7bebcdb08c3a0
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 am: 268feccbedwaynema
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: I24122a38ac278f6708dfcf0e9af0746a1f859c0f
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79waynema
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: Ic2e279f27a18fd5e10e0e2637a8fe096029550e0
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79waynema
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: If0c316576f5c8b727f05158d32227837b9810f2b
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79waynema
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: I1eebf08133e07da15da3e8ea266b72b0dfec585a
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 00:40:23 +0000