summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-28Merge "Fix licenses and license texts."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2022-01-27Fix licenses and license texts.Bob Badour
Entire project is 1p. Test: m nothing Change-Id: Ie41f4fb540d2c37be30a1244fb08134e16ced406
2022-01-27Merge "Adding BT dependency for CellBroadcast"Rahul Sabnis
2022-01-25Adding BT dependency for CellBroadcastRoopa Sattiraju
Bug: 196026708 Test: Compile Merged-In: Ia2449430fc268875f41fd8e116b9d51eface2b4c Change-Id: Ia2449430fc268875f41fd8e116b9d51eface2b4c
2022-01-11Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot
2022-01-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I35bd7158894e188add237e7663d24f00553ae68c
2021-12-14Merge "Merge Android 12 QPR1"Xin Li
2021-12-14Merge Android 12 QPR1Xin Li
Bug: 210511427 Merged-In: I3b51ca2fcf6e9960ecbc2f991eef2d4ad2641406 Change-Id: I20eac8f4053131144941413e900e6db5f5939391
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918temp_sam_210511427temp-sc-samXin Li
Bug: 205056467 Merged-In: I8c48ea817f34d5342ec27d09c25c183e3a011f7a Change-Id: I3b51ca2fcf6e9960ecbc2f991eef2d4ad2641406
2021-11-09Merge "Update owners file" am: 1a3824e4d7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/1885104 Change-Id: Ic5d6238ce92429a8122c1c53368a23b4b624bb0b
2021-11-09Merge "Update owners file"Treehugger Robot
2021-11-09Update owners fileSooraj Sasindran
add sasindran rm nazaninb Bug: 199432252 Test: build Merged-In: Ib41a3527ba18e65f5f6eecb7603b6fec3c7659ac Change-Id: Ib41a3527ba18e65f5f6eecb7603b6fec3c7659ac
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 3c077e219f -s ours am: ↵Xin Li
db9c64aa5f -s ours am: ab3b066688 -s ours am skip reason: Merged-In I6af7b492384112442b8f2181ee74170e212ccac2 with SHA-1 2d4e544193 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/1847754 Change-Id: I8c48ea817f34d5342ec27d09c25c183e3a011f7a
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 3c077e219f -s ours am: ↵Xin Li
db9c64aa5f -s ours am skip reason: Merged-In I6af7b492384112442b8f2181ee74170e212ccac2 with SHA-1 2d4e544193 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/1847754 Change-Id: I880afbc17abc2c70de7914b55d4ff21f7e58254d
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 3c077e219f -s oursXin Li
am skip reason: Merged-In I6af7b492384112442b8f2181ee74170e212ccac2 with SHA-1 2d4e544193 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/1847754 Change-Id: Ia17f6b801a2a58b37dd0fb3a6ea4207a3ca09176
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I6af7b492384112442b8f2181ee74170e212ccac2 Change-Id: Ia64cbab09d7c0497b9392a9187dc7fca08b25c09
2021-10-02Merge changes from topic "presubmit-am-976fde13bc62471bbe0637865e9ea1ab" ↵TreeHugger Robot
into sc-qpr1-dev am: 4639cc2ac7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15957898 Change-Id: Id16655e66969ef064a770eaa69099b13a4daaff3
2021-10-02[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 2a70b806e3 am: a9ec74c443 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15957898 Change-Id: I9d610955746f1ef57968d1e3b68f7aa94a02921c
2021-10-02[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 2a70b806e3 am: 8e0e93248b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15957898 Change-Id: I3f1cf11906337fa7b4859571f441e68b769c06dc
2021-10-02Merge changes from topic "presubmit-am-976fde13bc62471bbe0637865e9ea1ab" ↵TreeHugger Robot
into sc-qpr1-dev * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a70b806e3 Import translations. DO NOT MERGE ANYWHERE
2021-10-02[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-qpr1-dev am: ba7c758531 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15958445 Change-Id: I27a6d69e90d7614a46b1c74d8e96e4c37af6ad03
2021-10-02Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-devTreeHugger Robot
2021-10-01Merge "[CellBroadcast] Enable reminder interval UI for wear" into ↵Tom Hsu
sc-qpr1-dev am: ae509524e4 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15723687 Change-Id: I1cd34e267b76a91b1fd7b49a9b6bf4a830995b53
2021-10-01Merge "[CellBroadcast] Enable reminder interval UI for wear" into sc-qpr1-devTom Hsu
2021-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2b8cde00012f6821879849461545966ae1a06f6b
2021-10-01[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a70b806e3Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15957898 Change-Id: I96fcd4a19f71afa67b8599f1cf6b68069b45caf2
2021-10-01[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a70b806e3Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15957898 Change-Id: I65db5aa85e8370ae550e85e73b3424c29360dcab
2021-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ide461b4859df045f42ec4e8b5bb25635f35d94f5
2021-09-29Merge changes from topic "presubmit-am-ef0b5ff7c48049dd902906446e7aed19" ↵Bill Yi
into sc-qpr1-dev am: 2dd0349f1c Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15932799 Change-Id: I1fd1177312c94fd34210ef93ae4487ac362ea0ae
2021-09-29[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 90d0a14ff8 am: 6b1b84ced0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15932799 Change-Id: I34498dba842ad9ed3000220312dc2dd5d8e822e6
2021-09-29[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 90d0a14ff8 am: a2fb54aae4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15932799 Change-Id: I6ae5d38306f6ae2bb9e2d093151854d15a1fd790
2021-09-29Merge changes from topic "presubmit-am-ef0b5ff7c48049dd902906446e7aed19" ↵Bill Yi
into sc-qpr1-dev * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 90d0a14ff8 Import translations. DO NOT MERGE ANYWHERE
2021-09-29[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0372f91454 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15932800 Change-Id: Ia3f97a8a3d61dc871b2e912e1db01e0d4da327cb
2021-09-28Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7469d529381b474064b8722506566481e50c88c1
2021-09-28[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 90d0a14ff8Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15932799 Change-Id: I0e528688982c28f5e92c16c60eaa63ef7ed5bfd5
2021-09-28[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 90d0a14ff8Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15932799 Change-Id: I16e14997ad29286fdb73b130214b6975815becb9
2021-09-28Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1005e2579dfee293b7da76c86e72e202626473e4
2021-09-27Merge changes from topic "presubmit-am-8be099d342074cd6b2b2aa6b3990b45a" ↵Bill Yi
into sc-qpr1-dev am: cef3bc2f28 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15914916 Change-Id: I529ed6b57c92198996ff333ba531c3191b1f597b
2021-09-27[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: e747af6a66 am: 7ddcec5e80 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15914916 Change-Id: Ib9176bc0b965bcb5c08d39e9d2afe9d1b867d3e7
2021-09-27[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: e747af6a66 am: baf979b362 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15914916 Change-Id: Ibd4d43ba61417ab3d89c5017fe44ff905cea0b1f
2021-09-27Merge changes from topic "presubmit-am-8be099d342074cd6b2b2aa6b3990b45a" ↵Bill Yi
into sc-qpr1-dev * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e747af6a66 Import translations. DO NOT MERGE ANYWHERE
2021-09-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
232bd6b750 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15914917 Change-Id: I1daffd8f7e80f30338dc5bd5aea3dbe910eb419b
2021-09-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I161fe27a796e1dd15fe4ab1ee2ae85a7949e1593
2021-09-25[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e747af6a66Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15914916 Change-Id: I44dee32d6c50e8007b52d9f52fe531a5efb92c12
2021-09-25[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e747af6a66Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15914916 Change-Id: I7c6af36edc85d31883976a4109025dbc112f05b9
2021-09-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idca50d9896e54c4016f1815aa4bec5ffefe96c7c
2021-09-24[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
sc-dev am: 4af51d59f4 -s ours am: 6d06349262 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15900061 Change-Id: I48d5787a492713d2aa9ab4a1b0414816d6d4ac68
2021-09-24[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
sc-dev am: 12c70391b7 -s ours am: 4981505073 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15899967 Change-Id: I703ae9605448626c34cb856d69028fc7c83d321d
2021-09-24[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
rvc-qpr-dev am: bb87bcc585 -s ours am: 72bc52124a -s ours am: 0e0ea93e0f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/15899876 Change-Id: Ibb9d62ae3b98f0496096ed4c234402f5fe62f280
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 21:30:32 +0000