aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I6312b972019a5d98f9466faf83a958de2fe9657d
2018-09-18Merge "Convert jdiff to Soong" am: 9335763d33 am: fa10df3198Nan Zhang
am: 54e26747b0 Change-Id: I07032d2a059c39fe1c3c02234b809d1ac2da55e4
2018-09-18Merge "Convert jdiff to Soong" am: 9335763d33Nan Zhang
am: fa10df3198 Change-Id: I07daa5c89c6a3a95ceafddf0e21fbc5b97bc0808
2018-09-18Merge "Convert jdiff to Soong"Nan Zhang
am: 9335763d33 Change-Id: I1af2449ed78b9b511756ce9c932733b2f040974b
2018-09-19Merge "Convert jdiff to Soong"master-cuttlefish-testing-releaseandroidx-paging-releaseTreehugger Robot
2018-09-17Convert jdiff to SoongNan Zhang
Test: api-stubs-docs-diff Bug: b/78245848 Change-Id: Ic94495004da66109d73e7216c96c7d3ed759fce5
2018-08-08Merge "Merge Android Pie into master" am: 245e274aee am: b8de046a8e am: ↵Xin Li
705c6c23da am: 697671890b Change-Id: Ibe50718bc0f8e73f8451412b220c6b0ae4b76d71
2018-08-07Merge "Merge Android Pie into master" am: 245e274aee am: b8de046a8eXin Li
am: 705c6c23da Change-Id: If761b5a8359c903d6d3ea96b20cacaa08d4887b6
2018-08-07Merge "Merge Android Pie into master" am: 245e274aeeXin Li
am: b8de046a8e Change-Id: Ic0314808e7dd6c9108f1f38a68e25a817a28cbb1
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: 245e274aee Change-Id: I6239a1e4f84d09e5ed70c5511a13fd25d3c5ecdb
2018-08-07Merge "Merge Android Pie into master"Xin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: I7f62c46dcc0163bc66c2c764b3a8f9aa20c85021
2018-07-17Merge "Add gitignore to ignore iml Intellij files." am: fe19ba361e am: ↵Aurimas Liutikas
1dc7e44151 am: 6825bdb7b4 Change-Id: Id6d36fdf9744a2b6ea31487d9e0d8306dae34a6d
2018-07-17Merge "Add gitignore to ignore iml Intellij files." am: fe19ba361eAurimas Liutikas
am: 1dc7e44151 Change-Id: Ia2b6238afe327c7cb18753ec616b1a744b013677
2018-07-17Merge "Add gitignore to ignore iml Intellij files."temp_p_mergeAurimas Liutikas
am: fe19ba361e Change-Id: If7a754915117dbedabfe32cf0e4a82f977e8030d
2018-07-17Merge "Add gitignore to ignore iml Intellij files."android-room-releaseTreehugger Robot
2018-07-17Add gitignore to ignore iml Intellij files.Aurimas Liutikas
Test: git status is now clean Change-Id: I34f8eb6434dd30efea2f652f470cea3ba8773abf
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 3a4b4fe3e2Xin Li
am: 2dd9530062 Change-Id: I40c3cef97845a12232d540b261e964077bf81b4b
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 3a4b4fe3e2 Change-Id: Icb0660ef287cccccbabc924fb3ad98969b805844
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: Ic89a03abc8c314b408fc9ecf9edfae54f4eb0a27
2018-04-30Remove embedded analytics js tags.Dirk Dougherty
Bug: 77500217 Test: make jdiff Change-Id: I24f925b805e41e90f07e16ed977a083c5e289a51
2017-12-12Snap for 4498106 from fde271c55c4ad799438cac30173f25368c0ffa02 to pi-releaseandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-p-preview-5android-p-preview-4android-p-preview-1android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releasepie-arcp-preview-1android-build-team Robot
Change-Id: I5467bbd9dc564e38d8765c5289b0c8a2bb921a9b
2017-12-11More redirection stubs for added packages.android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devJeff Sharkey
Last change only handled added classes in existing packages; we now emit stubs for added packages. Change-Id: Ic148b5e555643e03ddd99a61fa3a73142bed6076
2017-12-11Snap for 4496165 from b052455f5696233618986c49859926379b0dd0ec to pi-releaseandroid-build-team Robot
Change-Id: I0e86df66a93af8e44aae0066ab0cb4eddf895334
2017-12-08Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d59157b919 -s ours am: ↵Xin Li
90c3332f39 am: 4ae982993f -s ours Change-Id: Ied3c55e21bdaa7aeeb611c10da6a1ac6dcee2090
2017-12-07Manually merge changes from giant AOSP topicStephen Li
Change-Id: I6802453fdce0ebeb1c443a8277f692442225dbe9
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d59157b919 -s oursXin Li
am: 90c3332f39 Change-Id: Ifa1acbe1deacceb2f2383434bd06e6943711f223
2017-12-07Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li
am: d59157b919 -s ours Change-Id: I6aebd4794fcdeb19bbe0911f4f05b85b6b753d29
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: 86b02b72a0 -s oursXin Li
am: 5e6279d25d Change-Id: I2991a335075e04f0cb567ebed95aae1be05df39f
2017-12-07DO NOT MERGE: Merge Oreo MR1 into masterXin Li
am: 86b02b72a0 -s ours Change-Id: Ia4649ee11ed19aa42c92d96c3b52d8ede94ac4fe
2017-12-06Emit redirection stubs for added classes.Jeff Sharkey
Incoming links don't differentiate between added and changed classes, so emit a tiny stub HTML file to redirect to the full documentation. Change-Id: I550ef046d8055979d82eef1d8668d5dabbdfe922
2017-12-06Merge "DO NOT MERGE: Merge Oreo MR1 into master"android-wear-p-preview-2Xin Li
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterXin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I904dcc800ebf299e41542e2df389b6dcce1dc84a
2017-11-30Snap for 4476081 from 74b7331c554fb0a4e55733589067edb96e51ea57 to pi-releaseandroid-build-team Robot
Change-Id: I21107969184e22f6b7b2d13a8760121ef6a3e61d
2017-11-29Add another CSS reference for local docs.Jeff Sharkey
It looks like the CSS is located in a slightly different location when viewing directly from out/ paths, so try loading both CSS paths. Test: make -j32 offline-system-sdk-referenceonly-diff Bug: 69115817 Change-Id: Ic7dfc0be95494444ed4705b612dd1a88c1223bfb
2017-11-12Snap for 4447680 from ac1958693ba22f043e16c1216d629dcbf60de0dd to pi-releaseandroid-build-team Robot
Change-Id: Ia34d1eee8e8aaab08587bb3da48b4882de2f0320
2017-11-06Ignore *.iml files in gitSergey Vasilinets
Change-Id: Iff5c2ed76dd9d5be6228a5ad5de7e4efa94063ff
2017-10-20Snap for 4407698 from b8f4c4b294b33c8557a3488a28e88cee90ff5073 to pi-releaseandroid-build-team Robot
Change-Id: I5bfcc5d6c986e2d19cb27c8f8a90cc9f78ccff65
2017-10-17Allow empty API XML fileAlan Viverette
Bug: 67888350 Test: Support Library -> ./gradlew generateDiffs with new library Change-Id: Ibb893453772729a58c13827c7fd6f0ae73437d85
2017-10-03Snap for 4373608 from 51e85e0fd5e532d7ceb2600d62c845498094f895 to pi-releaseandroid-build-team Robot
Change-Id: I14ad1bdc1fcd40373fe737368a5dcbaab03af8c2
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 am: fe347a5d71 am: b56f6f45d5 -s ours Change-Id: I4b25e7717075c284d0b4065e08ecdfb1f4fb50b8
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 am: fe347a5d71 Change-Id: I40913c9f2299acff71e00b45fae7bf692127f207
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 am: adeb6f14de -s ours am: 34c7705205 am: 7cf612ea28 -s ours Change-Id: Ia448772227d516f828e483453b885a3997ec93a2
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 am: adeb6f14de -s ours am: 34c7705205 Change-Id: I5eae95b33ae6564efcf73f4f04f3d7b7fe04257b
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 Change-Id: I6761c36507afd4561f65a58d853320f07e500221
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 "Merge in some android customizations. Minor cleanup. am: dcb310be2a ↵Dirk Dougherty
am: bb6b51fdff am: 54976f107c" into oc-mr1-dev-plus-aosp am: 470394b280 Change-Id: I5b2c05f3d451b276b9a97db059722c5d04ee27da
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 12:03:37 +0000