aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBill Rassieur
am: 2a034c9230 Change-Id: Ib480e7df7263d38b08e8ffaa3609d5917234631e
2019-04-03Merge "Merge "Annotate intended unsigned overflow" am: 1ed3d35baf am: ↵Android Build Merger (Role)
5b97349009 am: f5e06cc971"
2019-04-02Merge "Annotate intended unsigned overflow" am: 1ed3d35baf am: 5b97349009Janis Danisevskis
am: f5e06cc971 Change-Id: Ie9d05d7fb16d42829b94eb61233294459a3e4564
2019-04-02Merge "Annotate intended unsigned overflow" am: 1ed3d35baf am: 5b97349009Janis Danisevskis
am: f5e06cc971 Change-Id: Ie38ec1940e6b4b68770ec0fe9c86dbf396221a9c
2019-04-02Merge "Annotate intended unsigned overflow" am: 1ed3d35bafJanis Danisevskis
am: 5b97349009 Change-Id: I92f06883833592aedb736bd84dcc0773fa6768e6
2019-04-02Merge "Annotate intended unsigned overflow"android-o-mr1-iot-release-1.0.13Janis Danisevskis
am: 1ed3d35baf Change-Id: Ibe66a459351c1704cf541a21d668053b793aa70c
2019-04-03Merge "Annotate intended unsigned overflow"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-04-02Annotate intended unsigned overflowJanis Danisevskis
Annotate intended unsigned overflow in CodedInputStream::ReadTagWithCutoff. Bug: 128991260 Test: Manual test setup with gdb and keystore. Change-Id: I11ad92932d4938d77f3d1c33fe7f31a03e0da25e
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: If420ad153c174b96216b503ef0a37a2470278af1 BUG: 129345239
2019-03-27Merge "Add the zero copy input stream implementations to proto lite."Joe Onorato
2019-03-26Merge "Add the zero copy input stream implementations to proto lite." am: ↵Joe Onorato
7a5fd27c55 am: 03e4228d92 am: fc4f1c09aa Change-Id: I3db736c7243b0a9ec38386740a780d9f4f963ff8
2019-03-26Merge "Add the zero copy input stream implementations to proto lite." am: ↵Joe Onorato
7a5fd27c55 am: 03e4228d92 Change-Id: I0a6bf8ffbc8a51c89797c75076151c5624a262d8
2019-03-26Merge "Add the zero copy input stream implementations to proto lite."Joe Onorato
am: 7a5fd27c55 Change-Id: I9b5dfe72ac8e7a2f5508488e6439f0b8dbedcacd
2019-03-26Merge "add me to owners" am: 00ffd93b9a am: c7ec13a7baJoe Onorato
am: 55f71ffad6 Change-Id: I0a90a483cf63b42fcf9abb9acb64cdc139f7066e
2019-03-26Merge "Add the zero copy input stream implementations to proto lite."Joe Onorato
2019-03-26Merge "add me to owners" am: 00ffd93b9aJoe Onorato
am: c7ec13a7ba Change-Id: I54bf8ada908cdbd9e6c9bdbf0f8ec5b53d280932
2019-03-26Merge "add me to owners"Joe Onorato
am: 00ffd93b9a Change-Id: I633050800f96d9bb460c441c789226aebca03a81
2019-03-26Add the zero copy input stream implementations to proto lite.Joe Onorato
They aren't particularly heavy, and they are *more* efficient than the copied input stream ones that are already there. Test: make Bug: 123543706 Change-Id: Ie2b9661807d65e2fdde1481aa32bbf42206d53ae
2019-03-26Merge "add me to owners"Joe Onorato
2019-03-26Add the zero copy input stream implementations to proto lite.Joe Onorato
They aren't particularly heavy, and they are *more* efficient than the copied input stream ones that are already there. Test: make Bug: 123543706 Change-Id: Ie2b9661807d65e2fdde1481aa32bbf42206d53ae
2019-03-26add me to ownersJoe Onorato
Change-Id: I8a2805ec229fff44d6c613a8ec1e309635ebd2da
2019-02-19Merge "Mark libprotobuf-cpp-lite as double_loadable" am: 6ed677222c am: ↵Jooyung Han
2e428a8fda am: 20c1e160f3 Change-Id: I96ee33ea218010e7f982bf4406a6513652c2dc23
2019-02-19Merge "Mark libprotobuf-cpp-lite as double_loadable" am: 6ed677222cJooyung Han
am: 2e428a8fda Change-Id: I69248ae5fc9a3212531291c1750333bd5d4540f0
2019-02-19Merge "Mark libprotobuf-cpp-lite as double_loadable"Jooyung Han
am: 6ed677222c Change-Id: Idef3f7da315501aeaa32be359b41eba876a5349e
2019-02-20Merge "Mark libprotobuf-cpp-lite as double_loadable"android-q-preview-1android-o-mr1-iot-release-1.0.10Treehugger Robot
2019-02-08Mark libprotobuf-cpp-lite as double_loadableJooyung Han
libprotobuf-cpp-lite is a VNDK lib and also used by LLNDK(libmediandk) which means this lib can be double-loaded. (deps: libmediandk -> libmedia_jni -> libmediadrm -> libprotobuf-cpp-lite) Bug: 121280180 Test: m -j Change-Id: I2b221f3064cab169c76b94f1a40722f57925fb96
2019-02-04Merge "Merge Android Games SDK into master." am: f7270a236e am: 497dc94d01Xin Li
am: 636042bb4a Change-Id: Iaaf3acd32bb861f540f2aaffa9d7429a6bb5d50a
2019-02-04Merge "Merge Android Games SDK into master." am: f7270a236eXin Li
am: 497dc94d01 Change-Id: If4306d36867c871e44ee940dd4dce9e4199f744a
2019-02-04Merge "Merge Android Games SDK into master."Xin Li
am: f7270a236e Change-Id: Id644adc959c6949c5a46a06de8de98740863b659
2019-02-04Merge "Merge Android Games SDK into master."Xin Li
2019-02-04Merge Android Games SDK into master.Xin Li
Bug: 123068679 Change-Id: I6682c55e8793ec5b98714b52b8970041c91b1a90
2019-02-01Merge "Suppress unused-const-variable warnings." am: 88df183035 am: c46edf76a2Aurimas Liutikas
am: c882dbb543 Change-Id: Ib9ea4c0062a51462fafd8b2a585c71a533718196
2019-02-01Merge "Suppress unused-const-variable warnings." am: 88df183035Aurimas Liutikas
am: c46edf76a2 Change-Id: Ic16301b841c1f39d28ca73457373bbc1a64c131e
2019-02-01Merge "Suppress unused-const-variable warnings."Aurimas Liutikas
am: 88df183035 Change-Id: Ied791b1f4af7aa88494bc899a255f0a9e4ebde35
2019-02-02Merge "Suppress unused-const-variable warnings."Treehugger Robot
2019-02-01Suppress unused-const-variable warnings.Aurimas Liutikas
We don't fix these warnings and upstream has them suppressed, let's not pretend we care about them. Test: make -j Change-Id: I29c91ceebd69b4bafd3f954906e91933d887202f
2019-01-28Merge "Convert Android.mk file to Android.bp" am: dd1a085edf am: baa158c1a9Sasha Smundak
am: bc98ae2985 Change-Id: I45e13544abd603e5dfd284a3656491b81fe73475
2019-01-28Merge "Convert Android.mk file to Android.bp" am: dd1a085edfSasha Smundak
am: baa158c1a9 Change-Id: Id21fa0d851ed40d24472eeaa990c9fe301b35d43
2019-01-28Merge "Convert Android.mk file to Android.bp"Sasha Smundak
am: dd1a085edf Change-Id: Ied213d47d8ed2bf0bfd727c74b9ef954cd412ee6
2019-01-28Merge "Convert Android.mk file to Android.bp"Treehugger Robot
2019-01-27Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Change-Id: If2c8c42b8a09562dec01f5ab74faad4df99bea03 Fixes: 122332989 Test: treehugger
2019-01-10Merge "Add default code reviewers into OWNERS" am: 67d651e773 am: 5871442387Chih-hung Hsieh
am: 399c6a0362 Change-Id: I57e12181b495e51e6b5a5fe2a6bfc6a4edba499a
2019-01-10Merge "Add default code reviewers into OWNERS" am: 67d651e773Chih-hung Hsieh
am: 5871442387 Change-Id: I49a853013f232b03191c294a1a5dd1b1e43a6c48
2019-01-10Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 67d651e773 Change-Id: I777e08812119e297926faefaacf204a7a27e40d2
2019-01-10Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-10Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I971f303b1b2fcdce66f20a5551b56b64f815651b
2018-11-06Merge "Revert "Merge changes from topic "protobuf3.5.2""" am: 0dac9ed696 am: ↵Colin Cross
e7610daee2 am: 6d72549a33 Change-Id: Id6606e0da9e76e2eae0801a55a1252227ee6e3c7
2018-11-06Merge "Revert "Merge changes from topic "protobuf3.5.2""" am: 0dac9ed696Colin Cross
am: e7610daee2 Change-Id: I4ecc74378cfbe4513eb50a3411de1c039c3ab175
2018-11-06Merge "Revert "Merge changes from topic "protobuf3.5.2"""Colin Cross
am: 0dac9ed696 Change-Id: I23762739f36dbb9d53ea69b715ecbdb3cb9b85c5
2018-11-06Merge "Revert "Merge changes from topic "protobuf3.5.2"""android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseColin Cross
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 06:59:23 +0000