summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge Android 12HEADmasterXin Li2021-10-06210-716/+1795
|\ | | | | | | | | | | Bug: 202323961 Merged-In: I64e7be8bd815a3f3bf84277ffb9ea801a5dceb24 Change-Id: Ib2ecaa196b974cec584f6ae5c1e8b4092818d73a
| * Fix license text -- switch to Android-Apache-2.0 am: 4bc189377dBob Badour2021-09-041-18/+15
| |\ | |/ |/| | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/1745199 Change-Id: I64e7be8bd815a3f3bf84277ffb9ea801a5dceb24
* | Fix license text -- switch to Android-Apache-2.0android-s-beta-5android-s-beta-5Bob Badour2021-09-031-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove Apache 2.0 from license that also included a Public Domain license to pick up the global license text. Make explicit that the remaining Public Domain license requires no license_text. Test: m nothing Bug: 151177513 Change-Id: Ic9da28b65630b83c3bf4f3441fc54d9364b845e9 Merged-in: Ic9da28b65630b83c3bf4f3441fc54d9364b845e9
| * Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2021-08-14210-739/+1818
| |\ | | | | | | | | | | | | Merged-In: I43f3c33b45b8f3d9ac95d6d26e2cf9925d24ed9e Change-Id: I65c0ab742873e78b28c9816d83e6b7518466971b
| | * [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot2021-08-100-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mainline-prod am: 1a8417a2a2 -s ours am: 7da9c5a26e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512694 Change-Id: I43f3c33b45b8f3d9ac95d6d26e2cf9925d24ed9e
| | | * [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵android12-devTreeHugger Robot2021-08-100-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mainline-prod am: 1a8417a2a2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512694 Change-Id: I1ec06f15f6e74829e58ec3811fe7d3455c0305b9
| | | | * Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodTreeHugger Robot2021-08-101-1/+1
| | | | |\
| | | | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I0efeeeee1801c51dfd4082182e5cc70cdb14b073
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 393a5b5a01 -s ours am: c0a5585099 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512700 Change-Id: I7d3266c9263d5216f9b2375904fd3bc81942710e
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-100-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 393a5b5a01 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512700 Change-Id: I43608b12b49dd525ccfc09bd74e7599f6d015d70
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ia0807e7734e30e666514fa47a642a4da86d30da6
| | * | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot2021-08-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr-dev am: e4f34ff1c2 -s ours am: bd0ba11ef4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512696 Change-Id: Ia0b7aab82fcc4aa9448cdea5bb046240a469ae46
| | | * | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot2021-08-100-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr-dev am: e4f34ff1c2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512696 Change-Id: Ic4408c7df8eb54b455d266d215d4ca572f5b4182
| | | | * \ Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-devTreeHugger Robot2021-08-101-1/+1
| | | | |\ \
| | | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I969ace2be1f97245f9a584f757eeb08531fad77f
| | * | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb7c0abc14 -s ours am: 0cb5b5e9ea -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512702 Change-Id: I46e95f9ebbf3a6dbf6d3589ef289bd89c0384c2c
| | | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-100-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb7c0abc14 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512702 Change-Id: Ic5f6f78e94d7f0c106fed5dad23bf1aca2d37895
| | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I7f76d3a1212d1a4f32e033fc9e7fd9787bed9ea2
| | * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot2021-08-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sc-dev am: c67f369fa1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512706 Change-Id: I6f373473a12682e71277038f66eac4309b50541b
| | | * | | Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot2021-08-101-1/+1
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: If50d3d9a314d4263582d2ee9f186b8e782f88b29
| | * | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 493ea60038 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15512698 Change-Id: I794e5568d385c8075ce2cc1d5a881b84326d9a3b
| | | * | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-101-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I5b6934eb0b427ad15905dcebce5f6a52537a12ce
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc1d1ce1ed -s ours am: e8d6ac7261 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15486666 Change-Id: I0df1327679ea852ff2dd0182c3ce14f27459baa7
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-070-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc1d1ce1ed -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15486666 Change-Id: I0da51ba2538e323eca098d8e2536e6c3a22c3f7f
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ib89046085fc86fea85764e85ea8ef6fc9fde318a
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c2b102017 -s ours am: 5a71ec21bd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15486668 Change-Id: I967e4e1185b84c77ac0c1b6cc9ed1a1006528c89
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-070-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c2b102017 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15486668 Change-Id: Ie641fb1b8e79c88d37c074a970cefab467e487ca
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Iaf50f26831b1717e1abfddffaf8201dec77a4865
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d002c358f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15491130 Change-Id: Ifb0ad0e87c537e49b325e40baa23994e2f1a4c67
| | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-08-071-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ie352f8efc233c057b7951587e5e710afc6950008
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c74b63bc01 -s ours am: 8a10e8dd75 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15435515 Change-Id: I8796813dd4a81a28f66edcac2463e5a4d47c44d4
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-010-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c74b63bc01 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15435515 Change-Id: Ibec25ea47c688e39980d4528e8f8bfb89b78607c
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ic0e57cb349efe0306780c3815a3a62f9f2d4075a
| | * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot2021-08-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sc-dev am: 851434e5e3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15435517 Change-Id: Ib6748642ff4bb006bb33634740b2a368448059df
| | | * | | Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot2021-08-011-4/+4
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ifa26d358255dae630f7f093e61825c0ef440e776
| | * | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96780d5096 -s ours am: 5a22136d16 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15435512 Change-Id: I35809311219991d1c0e5f50898a9d103907238ba
| | | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-08-010-0/+0
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96780d5096 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15435512 Change-Id: Icd644717670558fe6571e0b2978326c0e252136c
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I268899e557a194b73d0e6e8f266efb0fe733bc01
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-280-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b62594ba10 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15411987 Change-Id: I901b1ae732b7781b9f7b4e5f86132a840101e9d0
| * | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-285-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I927e9e3ef1ee6de7c7adc52336c9e0b382e47bb2
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d46b54740 -s ours am: b7b2f79177 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15373241 Change-Id: I46bbd05d21f72795b8e144835121e5d62d1b2b3f
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-240-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d46b54740 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15373241 Change-Id: I8f0ececcb7e1cde627112ab84a8deb0b131ff814
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I13e3b4937e64c87df0bc09c61e7087b8cc2c8a51
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-230-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d581709b1c -s ours am: 222d229603 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15377192 Change-Id: I7092da1383abb3e4ac381cb513ad3a482be61e7d
| | | * | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-230-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d581709b1c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15377192 Change-Id: I8a44bad7a56b92888bdc77ad9e8f5db0e61fe649
| | | | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ica54273ae024367a395e46eb0b24431b93937bc3
| | * | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-07-230-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2dee58cfe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/15373243 Change-Id: I195a2aa89fa9585fc56c1d1391bec39d8bf5e2bd
| | | * | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I888903d34a6250d087e9de17136c9092aa8b0ca5
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 12:22:29 +0000