aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-09Snap for 4384531 from 6e2b838e740753f000b72daf32bd49dd82b7ed5d to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
Change-Id: I813be1c12149703b2f8ffc45bf0bd653992c6af7
2017-10-03Snap for 4373604 from 34c7705205f1f551fd6c3a4baee065f467a2011d to oc-mr1-releaseandroid-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-o-mr1-preview-2android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-releaseandroid-build-team Robot
Change-Id: Ia2d2afd705e736267afc02984f9b38c192f6ae20
2017-08-03DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from ↵oreo-mr1-devXin Li
merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47 -s ours am: 204e9aac8f -s ours am: 74de8ccdf6 -s ours am: adeb6f14de -s ours Change-Id: I5489d60233ba7684ec3467e3ef895e9758b86506
2017-08-03DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from ↵Xin Li
merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47 -s ours am: 204e9aac8f -s ours am: 74de8ccdf6 -s ours Change-Id: I770c07b93c107933697b01508470fb4c280b3c38
2017-08-03DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from ↵Xin Li
merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47 -s ours am: 204e9aac8f -s ours Change-Id: I49aed1d93d0f1f8b474bcd8b39d1adf8bc4cf300
2017-08-03DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from ↵Xin Li
merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47 -s ours Change-Id: I8e0fe100958bc1628d348a986d368517dfa4b2ea
2017-08-02Merge in some android customizations. Minor cleanup. am: dcb310be2a am: ↵Dirk Dougherty
bb6b51fdff am: 8b61dbc442 am: 3f26426dbb Change-Id: I29fcffba08bb4ca803727a79dd7a70da2585aaf8
2017-08-02Merge in some android customizations. Minor cleanup. am: dcb310be2a am: ↵Dirk Dougherty
bb6b51fdff am: 8b61dbc442 Change-Id: I03f4557d545bc5cf4b3d2ad971040513485e738c
2017-08-02Merge in some android customizations. Minor cleanup. am: dcb310be2aDirk Dougherty
am: bb6b51fdff Change-Id: I90bf85bdd53d1d5827b54d9666a42b44d004bd12
2017-08-02Merge in some android customizations. Minor cleanup. am: dcb310be2aDirk Dougherty
am: fb0ab1f5ed Change-Id: Ibd051b3eb4c820a9ead9bc7a0090e8a72de3e443
2017-08-02Merge in some android customizations. Minor cleanup.android-wear-o-preview-4Dirk Dougherty
am: dcb310be2a Change-Id: I21ae839d8e5b7c109ea7652a310aa3f7a856fe1f
2017-08-02Merge in some android customizations. Minor cleanup.oreo-dr1-devDirk Dougherty
am: dcb310be2a Change-Id: Iadf1b943ebad87caf79ffbb6a54fb95e713b856d
2017-08-01DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28'Xin Li
from merge-oc-support-26.0-dev to stage-aosp-master. Bug: 64219148 Test: build Change-Id: Ic90155ad560f39f9e6fd1a8035e0d031ec0df0d1
2017-07-26release-request-08461da0-a262-4ebb-8c32-784b60a151df-for-git_oc-mr1-release- ↵android-o-mr1-preview-1android-build-team Robot
4216972 snap-temp-L74000000086000437 Change-Id: I980cdd12d0edfa090f6e89f5a8c19bb89598e00d
2017-07-25Add android-changes documenting what's different am: e31a208e36Alan Viverette
am: 4b1c110d30 Change-Id: Ib80e0a07a6d3796c665d6a454642486cd0cd41e0
2017-07-25Add android-changes documenting what's differentAlan Viverette
am: e31a208e36 Change-Id: I719d1b57819b6b1b51bd809f7e07dc40432c029c
2017-07-25Add android-changes documenting what's differentAlan Viverette
Test: n/a Change-Id: Ica5c2b11fc127cc1d69a4e83af5275b391bbfb6a
2017-07-24poke a file to kick build am: 2e3115d645Alan Viverette
am: 1303c45359 Change-Id: Ic7caf06e493cfae36a662d8c8abe38617532dd6c
2017-07-24poke a file to kick buildAlan Viverette
am: 2e3115d645 Change-Id: Id78e43708f68783642573c7021fea08246bbd1eb
2017-07-24poke a file to kick buildAlan Viverette
Test: n/a Change-Id: Ie557a2714d88e973289c3fc10fa66de80d2516f5
2017-07-24Poke version number following recent changes am: dfe34798b2Alan Viverette
am: c2fe1b8e28 Change-Id: I06722c9ecda154f0cff5aa92acd20bf4e0c4ccca
2017-07-24Poke version number following recent changesAlan Viverette
am: dfe34798b2 Change-Id: I6f0986b13f36dc1c62af3ef6a3d00492f4b34121
2017-07-24Poke version number following recent changesAlan Viverette
Test: n/a Change-Id: I05f479eb1e01457bb7c33eeb6855c2642c02dc28
2017-07-23release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release- ↵android-build-team Robot
4207446 snap-temp-L19600000085022555 Change-Id: I2af0bfceac12b395f20a77780be247d7a64280d2
2017-07-21Merge in some android customizations. Minor cleanup. am: a42162715cDirk Dougherty
am: c4978c1ccc Change-Id: Id2d1c1fbb71e359944be182037ea428f0012197d
2017-07-21Merge in some android customizations. Minor cleanup.Dirk Dougherty
am: a42162715c Change-Id: Ic062dfdbf372fb924bbc655aab6034278f410d7a
2017-07-21Merge in some android customizations. Minor cleanup.Dirk Dougherty
Change-Id: Id00a3b420214057e9b2b0f51007a5f26f4b0fb3a
2017-07-21Merge in some android customizations. Minor cleanup.Dirk Dougherty
Required to generate API diffs for platform SDK and Support Lib. Test: ./gradlew generateDiffs for Support Library Change-Id: Id00a3b420214057e9b2b0f51007a5f26f4b0fb3a
2017-07-11release-request-5ee66a34-3e58-4de0-ba73-1f49074ee497-for-git_oc-mr1-release- ↵android-build-team Robot
4169335 snap-temp-L20600000081126177 Change-Id: Iaa5276200c066c33f87008f23638d8ef6f8569e8
2017-07-11Add a simple settings.gradle file for Jdiff.Aurimas Liutikas
am: 8c169c2d60 Change-Id: If45d972efdf348cac1f9a340d83eec0955ad8c47
2017-07-07Add a simple settings.gradle file for Jdiff.Aurimas Liutikas
Adding settings.gradle file that allows Jdiff to be used as a composite build dependency. Change-Id: If07051a3b34f677e6815f59aa9ef893a81c3168b
2017-04-27Blank change to kick off the ub-jdiff-master builder.Aurimas Liutikas
Change-Id: I22129ed27013b60495726bd6e54218f14814762a
2017-03-14Add gradle wrapper and dist target for jdiff.android-wear-o-preview-3android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseo-preview-4o-preview-3o-preview-2o-iot-preview-5Alan Viverette
Bug: 36086933 Test: ./gradlew dist Change-Id: Ie8a8cce1bf94f452f24a160f227ec91d82d2d5df
2016-12-09Remove Android BuildUtils dependency from jdiff Gradle buildandroid-o-preview-1o-previewAlan Viverette
This allows jdiff to be included in standalone gradle builds, including the Support Library. Change-Id: I330eda7aa11caa754c71b5a3234e0f0681974cab
2016-05-10Fix merging add/remove on same method. am: 8f27032b2a am: 98ed536fd8Joachim Sauer
am: 62f4ca1f64 * commit '62f4ca1f64eaeb0896416949d6120b912ac67d3b': Fix merging add/remove on same method. Change-Id: I440220ee5e7a8a94eb6c56ff3573bb654db95dba
2016-05-10Fix merging add/remove on same method. am: 8f27032b2aJoachim Sauer
am: 98ed536fd8 * commit '98ed536fd800bf9ac02a9983da6dc08356a64fa3': Fix merging add/remove on same method. Change-Id: I454844d92904429ced507c6e014ff093ccb26518
2016-05-10Fix merging add/remove on same method.android-wear-n-preview-2android-wear-7.1.1_r1android-n-mr2-preview-2android-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-wear-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseJoachim Sauer
am: 8f27032b2a * commit '8f27032b2aaf133892562f83314efa39a9c2353c': Fix merging add/remove on same method. Change-Id: Ibc3ee191d337b882db84c47fbab4f703c2b494a1
2016-05-10Fix merging add/remove on same method.android-n-preview-5android-n-preview-4android-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-4android-n-iot-preview-2android-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-iot-releasenougat-devnougat-cts-releasenougat-bugfix-releasen-mr2-preview-1n-mr1-preview-1n-iot-preview-4n-iot-preview-2Joachim Sauer
Changes to methods are detected as both addition/removal and merged into a single "change" entry in a separate step. The code that searched for the equivalent "remove" step only ever looked at the first removed method with that name, ch caused the merging to change if several methods with the same name were changed at once (for example several overloads were precated at once). Bug: 27582395 Change-Id: I9718709de4d5e70c291c92ca2801e922f98a39a1
2015-08-27am 97a22150: am e99056f3: (-s ours) am 16f46fdf: Adjust jdiff to be able to ↵android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3android-n-preview-2android-n-preview-1n-preview-2n-preview-1C. Sean Young
read both Doclava and "regular" Jdiff API xml files. * commit '97a22150ae54eb113a25bc3651bed30c9e76b307':
2015-08-27am 29394eb7: am 6a9c978c: (-s ours) am e5f2cfb4: Merge "Remove ambiguity ↵Neil Fuller
around Parameter class on OpenJDK 8" * commit '29394eb7f99625bf99b26df2f4b2eec8d9f95170':
2015-08-27am e99056f3: (-s ours) am 16f46fdf: Adjust jdiff to be able to read both ↵C. Sean Young
Doclava and "regular" Jdiff API xml files. * commit 'e99056f372372400344a9a33f07c4337c0d5da92':
2015-08-27am 6a9c978c: (-s ours) am e5f2cfb4: Merge "Remove ambiguity around Parameter ↵Neil Fuller
class on OpenJDK 8" * commit '6a9c978c8918540919daa392712f480e5552e252':
2015-08-13am 4e4f52c3: am 16f46fdf: Adjust jdiff to be able to read both Doclava and ↵C. Sean Young
"regular" Jdiff API xml files. * commit '4e4f52c3df03d1451def023694abb9e17a6483fa': Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.
2015-08-13am 16f46fdf: Adjust jdiff to be able to read both Doclava and "regular" ↵C. Sean Young
Jdiff API xml files. * commit '16f46fdf56b5a04e19689969aeaffb58efeb5d92': Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.
2015-08-13am 16f46fdf: Adjust jdiff to be able to read both Doclava and "regular" ↵C. Sean Young
Jdiff API xml files. * commit '16f46fdf56b5a04e19689969aeaffb58efeb5d92': Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.
2015-08-12Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.C. Sean Young
Bug: 19914336 Change-Id: I3b27c178840ac31da67c99270b47bce4dae308db
2015-08-12am ac9a6960: am e5f2cfb4: Merge "Remove ambiguity around Parameter class on ↵Neil Fuller
OpenJDK 8" * commit 'ac9a6960113d79027cb45ba30f46608b71851430': Remove ambiguity around Parameter class on OpenJDK 8
2015-08-12am e5f2cfb4: Merge "Remove ambiguity around Parameter class on OpenJDK 8"Neil Fuller
* commit 'e5f2cfb43e14d4e32f145102ae398003e0ed5927': Remove ambiguity around Parameter class on OpenJDK 8
2015-08-12am e5f2cfb4: Merge "Remove ambiguity around Parameter class on OpenJDK 8"Neil Fuller
* commit 'e5f2cfb43e14d4e32f145102ae398003e0ed5927': Remove ambiguity around Parameter class on OpenJDK 8
2015-08-12Merge "Remove ambiguity around Parameter class on OpenJDK 8"Neil Fuller
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 13:38:41 +0000