aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-30Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Yuntao Xu
Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211 Change-Id: Ic8c3a89b04ad07e763be1a98f534cb3efcdd815a
2021-04-30Merge "Convert src/main/Android.mk to Android.bp"android-s-beta-2android-s-beta-1Yuntao Xu
2021-04-28Convert src/main/Android.mk to Android.bpYuntao Xu
Convert the Make file to a Soong one Bug: 186677673 Test: compared the two apk files built by Make and Soong Test: TreeHugger Change-Id: I90506bd1d462f56b588907bbb8f8974a78e06229
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android" am: ↵Treehugger Robot
7d23920f2b Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1682207 Change-Id: If2ac34fb2039f39f01788907ab22f233400a484a
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/android"Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to developers/samples/androidBob Badour
Added SPDX-license-identifier-Apache-2.0 to: security/FingerprintDialog/Application/src/main/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I4ce8436201b26f13f926804ea91a0fed1d687893
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I0e1120aafae610027333fd7f1c995d908f6e089a Change-Id: I5e282a1d9c93f15a3f2d6a3269ee96dab3b90da8
2020-11-24Mark ab/6881855 as merged am: bae055f6ffXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/13111968 Change-Id: I0e1120aafae610027333fd7f1c995d908f6e089a
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ib34a906538821d3fecbdb4dd77b8803ad2e27659
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s ours am: ↵Xin Li
f4b69e1ffe -s ours am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12794722 Change-Id: I8e3aaa18d7bd7c69e8b16881e1fee556dd048bfe
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s oursXin Li
am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12794722 Change-Id: I89bda30ff043b812b89af06d38dedf776e44f34b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I86165be8b788aaa750d9a1d00d3188801d735bd6 Change-Id: I4c04e98fe8861c8a6d4a007cbd15ca6973c7f53a
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am: 79e6f36845 -s ours am: c1c1d6bf6c -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ifff2652f8c190fcc64d55adadf35cb2c19a7bc8a
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am: 79e6f36845 -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ib73632928b186f77be7f9375ecd04dac50aca146
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: ↵Xin Li
46d255c5ee -s ours am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: I6a8a83d84bad18f01deb1a35f8b7c482f0af9eb8
2020-09-11[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s oursXin Li
am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: I982ea524e06a3fa8f02850f9e6b5ddf465729d81
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd Change-Id: I8944af4a5023a95b2328255ab550804726d287bb
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3f8d030a1f -s ours am: 63b8591043 -s ours am: 52d9ebfd54 -s ours am skip reason: Change-Id I7ebdd475c17377ecd3b6a7586442b55a12e32c37 with SHA-1 ca2402d8eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12469979 Change-Id: Ifae6f0e3a0c6c569f650abb0bc83f53173d92b3a
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3f8d030a1f -s ours am: 63b8591043 -s ours am skip reason: Change-Id I7ebdd475c17377ecd3b6a7586442b55a12e32c37 with SHA-1 ca2402d8eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12469979 Change-Id: I9dad8e5607a89b8bd0b9bbce89cf36509941495c
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3f8d030a1f -s ours am skip reason: Change-Id I7ebdd475c17377ecd3b6a7586442b55a12e32c37 with SHA-1 ca2402d8eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/samples/android/+/12469979 Change-Id: I42711ce9d2a0d33403b695084704136f477a3bbc
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I7ebdd475c17377ecd3b6a7586442b55a12e32c37 Change-Id: I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 am: d951dc8e29 am: d0435400ab am: b799234bc6 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ib23a985c3941ae99ac245f9c29926bae3e9e5ba4
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 am: d951dc8e29 am: d0435400ab Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ic692a35b5819777dbdca8b9f6cc019b603ac43e8
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 am: d951dc8e29 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ia26b0c80df080afb36dd723740abca78aeb6ce25
2020-08-19Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 4cd108aef6 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487 Change-Id: Ifef7030a615b225ff28bc1de06b4ba69ccf982a1
2020-08-19Merge "Update language to comply with Android's inclusive language guidance"Joanne Chung
2020-08-17Update language to comply with Android's inclusive language guidanceJoanne Chung
See https://source.android.com/setup/contribute/respectful-code for reference Bug: 162536543 Test: ./gradlew :Application:build Test: install success and see the changed text Change-Id: Ia04bd65ed9c7ac2116f0ff898fc57b9d9ecc3745
2020-08-17Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 1bab8b0107 am: 8d99f4d8e5 am: d7a6afd5b7 am: 7c00f5fed1 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1400288 Change-Id: I0b51150a76112fefd996de7034fbd65b35ddc330
2020-08-17Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 1bab8b0107 am: 8d99f4d8e5 am: d7a6afd5b7 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1400288 Change-Id: I7d3b0cf32a89ab4ff16a77d6b075fb9011297288
2020-08-17Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 1bab8b0107 am: 8d99f4d8e5 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1400288 Change-Id: I067e716a58c6e6f9009275339e3024ec3e7c33c8
2020-08-17Merge "Update language to comply with Android's inclusive language guidance" ↵Joanne Chung
am: 1bab8b0107 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1400288 Change-Id: I34e05f2103f1a4f8da0f51498db536cb89a10ba5
2020-08-17Merge "Update language to comply with Android's inclusive language guidance"Joanne Chung
2020-08-14Update language to comply with Android's inclusive language guidanceJoanne Chung
See https://source.android.com/setup/contribute/respectful-code for reference Bug: 162536543 Test: ./gradlew :afservice:build Test: install success and see the changed text Change-Id: I43ef643266e6fffa5ce92fe386154f81d924f0fa
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: b590b3f07f am: a6f5cae4ce am: 5403d40570 am: 37708888fb Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1381457 Change-Id: I1bc84cceae8eebec2e41485446c75feaa89ec46d
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: b590b3f07f am: a6f5cae4ce am: 5403d40570 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1381457 Change-Id: I86165be8b788aaa750d9a1d00d3188801d735bd6
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: b590b3f07f am: a6f5cae4ce Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1381457 Change-Id: Ib5c7fb0f4b1944ae6507fa080e0b042f439d0d18
2020-07-31Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot
am: b590b3f07f Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1381457 Change-Id: I383cc816e399ff5868f468b1433bd0c0e3eac885
2020-07-31Merge "Update language to comply with Android's inclusive language guidance"Treehugger Robot
2020-07-30Update language to comply with Android's inclusive language guidanceJeff Sharkey
See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Change-Id: Ie7e7dd0f1afcfa04856c29484304c15a6cc60c8b
2020-07-27Merge "Update language to comply with Android’s inclusive language ↵Xevi Miro Bruix
guidance" am: 698bcc6a30 am: 1cdaab7bda am: 3e82ffb72e am: 0b733d3cc9 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1371179 Change-Id: I96ccf45bce9fbd51c7f3b7eaff97e8fa3ab84196
2020-07-27Merge "Update language to comply with Android’s inclusive language ↵Xevi Miro Bruix
guidance" am: 698bcc6a30 am: 1cdaab7bda am: 3e82ffb72e Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1371179 Change-Id: I3574bef24df1c17124348ce26d479fcb7079d101
2020-07-27Merge "Update language to comply with Android’s inclusive language ↵Xevi Miro Bruix
guidance" am: 698bcc6a30 am: 1cdaab7bda Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1371179 Change-Id: Ic66bf514332fa57e0c11a2676131bda957dea99c
2020-07-27Merge "Update language to comply with Android’s inclusive language ↵Xevi Miro Bruix
guidance" am: 698bcc6a30 Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1371179 Change-Id: I464a77225e97f4476c6c9f133346263c451f4120
2020-07-27Merge "Update language to comply with Android’s inclusive language guidance"Xevi Miro Bruix
2020-07-23Update language to comply with Android’s inclusive language guidanceXevi Miro Bruix
See https://source.android.com/setup/contribute/respectful-code for reference inclusivefixit Bug: 161896447 Test: Modified documentation Change-Id: I380dd26d5d609900c59da4fc6afc251c3741e5b4
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-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_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 752c0d69bf am: 9083bced68 -s ours am skip reason: subject contains skip directive Change-Id: I7ebdd475c17377ecd3b6a7586442b55a12e32c37
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
stage-aosp-master am: 752c0d69bf Change-Id: Ie028918a35e49c5f7120bdf01e815ea7fd171215
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I3ff332601cb6031643e433a94d69966ad72c3598
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: aa864d3320 -s ↵Xin Li
ours am: e8fa75389b -s ours am: 150bae1aff -s ours am: 9ae584581c -s ours am skip reason: change_id I582907b16b86bd5ff750b480bd9d325d5bd899b1 with SHA1 b13d6ba1f0 is in history Change-Id: I9460b0bcef422c16c06c5cd3d499be1f1d528d3a
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 01:04:55 +0000