summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 5671254 from a96b00167a859a713fa4b8b944fa45311dffd6a5 to qt-releaselineage-17.0android-build-team Robot2019-06-192-2/+2
|\ | | | | | | Change-Id: I07ec8cb3804dbba3c3d166b0e341580f9ce3f545
| * Import translations. DO NOT MERGEBill Yi2019-06-182-2/+2
| | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I498a39d67a1e1f87ea0aead238830314109b0ee8
* | Snap for 5583555 from d454d5c25bc5f3d436ed356645edb15b36bc5ddf to qt-releaseandroid-build-team Robot2019-05-190-0/+0
|\| | | | | | | Change-Id: I777b550e3a7d6648f94034a3ac2abb9ddba3c3ae
| * [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-05-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | am: b2b50ed09a -s ours am skip reason: subject contains skip directive Change-Id: Ic42a6601ecd51f85f8084ba918f8af1c44bc125a
| | * Import translations. DO NOT MERGEBill Yi2019-05-182-3/+3
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I84e1a7f4b1a9addc90cf0df8be366d3239b6e47c
* | | Snap for 5480912 from 2ee107fc581660e9568f8121fa1c3cfb2b7e4743 to qt-releaseandroid-build-team Robot2019-04-182-3/+3
|\| | | | | | | | | | | Change-Id: Ia5af2a20d13f344af65e48db48427271e9aeaafe
| * | Import translations. DO NOT MERGEBill Yi2019-04-162-3/+3
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9c84d87e791efab9839e46cd0bac7671e1d2ae65
* | | Snap for 5434517 from 566555b85518b77b1c6b6141cf477f6cba6a5b8c to qt-releaseandroid-build-team Robot2019-04-042-0/+52
|\| | | | | | | | | | | Change-Id: I82a28d539273dac4e7738d6c4451f6e709cccaf9
| * | Merge "Move PhotoTable to /product" am: 0664acb5d4 am: b939abc4b2Anton Hansson2019-04-032-0/+52
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 0cdf2a5213 Change-Id: I0455b82bc6859fcfc8427a74104c5917ce13b819
| | * \ Merge "Move PhotoTable to /product" am: 0664acb5d4Anton Hansson2019-04-032-0/+52
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: b939abc4b2 Change-Id: Ifeab04e051a0454c4c76b60147a09ceb02f41fb5
| | | * \ Merge "Move PhotoTable to /product"Anton Hansson2019-04-032-0/+52
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0664acb5d4 Change-Id: Iffd3937fadd3d95cacbcf2e8631f19c6f5ed3f24
| | | | * \ Merge "Move PhotoTable to /product"Anton Hansson2019-04-032-0/+52
| | | | |\ \
| | | | | * | Move PhotoTable to /productAnton Hansson2019-03-292-0/+52
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This app is frequently overriden by proprietary apps on shipping devices, so move it to /product. Bug: 122353713 Test: launch app on aosp_blueline Change-Id: I4cb0415b3a283505f0550766d195238008d6c6f5
* | | | | | Snap for 5367932 from 603c56e12b1bea470cb94a6860ae0a5d674652e4 to qt-releaseandroid-build-team Robot2019-03-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ff3af2e2b74c5630b82fff31e25d5bdd82baea0
| * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into ↵Xin Li2019-03-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: c40dd9b4e8 -s ours am: 7144b2148b -s ours am: 4f52276095 -s ours am skip reason: subject contains skip directive Change-Id: Ibd266fe47a3192fd302ec7296f86e083011723fd
| | * | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into ↵Xin Li2019-03-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: c40dd9b4e8 -s ours am: 7144b2148b -s ours am skip reason: subject contains skip directive Change-Id: I0d73d99dde0cb8ca9e09937e396cea9144803b52
| | | * | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Xin Li2019-03-110-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c40dd9b4e8 -s ours am skip reason: subject contains skip directive Change-Id: Id8cf1b68b38b9155edacda795eeb5ec886bf1508
| | | | * | Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Treehugger Robot2019-03-110-0/+0
| | | | |\ \
| * | | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li2019-03-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69e9375d77 -s ours am: 05649ef3a4 -s ours am: c8e5fdba41 -s ours am skip reason: subject contains skip directive Change-Id: I402f31b9cb58fd8da9dfa315ea293915ca8891f3
| | * | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li2019-03-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69e9375d77 -s ours am: 05649ef3a4 -s ours am skip reason: subject contains skip directive Change-Id: I5187596a217144b3afe54a658eef603365acb193
| | | * | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 69e9375d77 -s ours am skip reason: subject contains skip directive Change-Id: Icd22ddca493be15262a074e5c46d2a7c87baba22
| | | | * | | DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Bug: 127812889 Change-Id: I075c2297d459fd913adddb909611a3c05337ede7
* | | | | | | Snap for 5335706 from 6fef28d42e7ee6609afbd5dd870727165b90d9b3 to qt-releaseandroid-build-team Robot2019-02-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1390ee85c22dadca4f2c2f22b1ec2409d0ffae7f
| * | | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d85848f767 Change-Id: I61a929438b902ab63a96f8116e7955e68901b16b
| | * | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 126125118 Change-Id: I92f9a8dbc5e22ca657aaceb02a9d91d749d5caf4
| | | * | | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-213-3/+3
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: Iaeb8ca0d8a01e0dd1243f1287369f037a134d69f
* | | | | | | | Snap for 5332298 from b5940b2034f94479b7fe6ecf8fda056b3d0fd75a to qt-releaseandroid-build-team Robot2019-02-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54d1b85e74bdbe11ad42994748ea8002acca1096
| * | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 8a45fbe7a4 -s oursBill Yi2019-02-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e7cdf00093 -s ours am skip reason: subject contains skip directive Change-Id: I4533b98817bf3417e1c47a9c04a354c69e3f52c5
| | * | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-02-220-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8a45fbe7a4 -s ours am skip reason: subject contains skip directive Change-Id: I5c8854e9b9714dcd5b595ee841fa6b7cb2ab34b2
| | | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-211-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id4dd928c7360f348e19b0e08ddf25623f87b5413
* | | | | | | | Snap for 5304721 from b4761efff2cecd9f93e86109f1327660f7305cde to qt-releaseandroid-build-team Robot2019-02-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25cd58d9920357308a9edf72e0c9fee36a400b87
| * | | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: 3f8aec2676 -s ours am: d5ec696793 -s ours am skip reason: subject contains skip directive Change-Id: I87eda98a3117c9265e2761be8bcff21eccfd5746
| | * | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-110-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: 3f8aec2676 -s ours am skip reason: subject contains skip directive Change-Id: I1f79567a0a3f42531540bbf4496c1a2b6852f2e6
| | | * | | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li2019-02-110-0/+0
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 124234733 Change-Id: I5fc7fd847065b967fc9185038b30dbd0f53dbefb
| | | | * | | Snap for 5180536 from ee53d2369e6e41780af2e461efb451d8f4c57bf2 to ↵android-build-team Robot2019-02-092-2/+2
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: If01da39f0097e29abc3b58bf38eb016c91e63a9e
| | | | | * | | Snap for 5073521 from 075621a33ab1380d669646ec40e184ddfa820253 to ↵android-build-team Robot2018-10-171-1/+1
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I0bd7b6cad7dd791688286b83fda84ab267bc4643
| | | | | * | | Snap for 5044688 from 276f0cc2830af7267aa06114655565a50921b548 to ↵android-build-team Robot2018-10-021-1/+1
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I31c2f8c514c8c80d31d5cc89278a3347f74f69a3
* | | | | | | | | Snap for 5280121 from fb079a63d134fb0e9521037104620815864326bd to qt-releaseandroid-build-team Robot2019-02-031-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I39edcc7fd0bc6751d7932c7c986735e3996578cf
| * | | | | | | | Import translations. DO NOT MERGEBill Yi2019-02-021-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia53de4ecd287f8d21a2f9ef438c360f0a046cb62 Auto-generated-cl: translation import
* | | | | | | | | Snap for 5220519 from ca909ec21899b2cc2d44e771c601a03ceb97e989 to qt-releaseandroid-build-team Robot2019-01-102-16/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82df0fa0a650f0597a3b4a5048dec92d87e42954
| * | | | | | | | Merge "Convert Android.mk file to Android.bp" am: f0e7d90f18 am: 88335a925bSasha Smundak2019-01-092-16/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2f9f55a35e Change-Id: Ib11bbc946afdc73f06f773c8e758f4e3fbcc812d
| | * | | | | | | Merge "Convert Android.mk file to Android.bp" am: f0e7d90f18Sasha Smundak2019-01-092-16/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 88335a925b Change-Id: I563f871793a4fdf77e9affb7edac57a8affbdd77
| | | * | | | | | Merge "Convert Android.mk file to Android.bp"Sasha Smundak2019-01-092-16/+6
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f0e7d90f18 Change-Id: I919c1302c4b9276cb1cb2656fc789eb3f8d8535d
| | | | * | | | | Merge "Convert Android.mk file to Android.bp"Treehugger Robot2019-01-092-16/+6
| | | | |\ \ \ \ \
| | | | | * | | | | Convert Android.mk file to Android.bpSasha Smundak2019-01-092-16/+6
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Change-Id: I677ff1f24d6d315a12263a454c735be40e148907 Fixes: 122332702 Test: treehugger
* | | | | | | | | Snap for 5171533 from a200cd02b9001144c94851e6991ea447a14bc9d8 to qt-releaseandroid-build-team Robot2018-12-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd1142da8246b11d99c0464bd77f8d4661acf819
| * | | | | | | | Merge "PhotoTable - update the PhotoTable app version to target P (28) or ↵Raman Tenneti2018-12-071-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | higher." am: e772d7913b am: c17b570765 am: 183ba61045 Change-Id: I8a5b8d6d16d657e3bb4afc8b3dbe991963bc5248
| | * | | | | | | Merge "PhotoTable - update the PhotoTable app version to target P (28) or ↵Raman Tenneti2018-12-071-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | higher." am: e772d7913b am: c17b570765 Change-Id: I161834dc13f4fafa9500057afdab65731faeec8a
| | | * | | | | | Merge "PhotoTable - update the PhotoTable app version to target P (28) or ↵Raman Tenneti2018-12-071-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | higher." am: e772d7913b Change-Id: If67599db7a25552aad2893646552224a880861b5
| | | | * | | | | Merge "PhotoTable - update the PhotoTable app version to target P (28) or ↵Treehugger Robot2018-12-071-1/+1
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | higher."
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 16:25:48 +0000