summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-15Merge changes from topic "presubmit-am-c30953f65a604e94bbd452f23524405d" ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseTreeHugger Robot
into sc-qpr1-dev am: f321ce1160 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I78eac83826d4adae2489ab4adbc4d4a358961c6f
2021-11-15[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 94785aa7db am: d72f50c3e6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I4d05fb1a81c68b27cd3720a6782a1e3e970c89e5
2021-11-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
11a8bf981f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231758 Change-Id: I17c2de99eb6d7d3c859035e291c071c07ac1fc62
2021-11-15Merge changes from topic "presubmit-am-c30953f65a604e94bbd452f23524405d" ↵TreeHugger Robot
into sc-qpr1-dev * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 94785aa7db Import translations. DO NOT MERGE ANYWHERE
2021-11-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie35073bde0551191213c96e35633adbd6539a495
2021-11-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic602520f08fb5a8acafd88b28a1d3f595a06c362
2021-11-10[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 94785aa7dbBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: Ie77dcb7c58436aea5ee6f553adf5957560117f4b
2021-11-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idedd1839551d00094e41f14500e5d3fb96540ce4
2021-10-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0acf3638bf -s ours am: 3214033fcc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16061796 Change-Id: I69e90831c78bd5eccc93765ee7c390cc07056eb1
2021-10-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7685eb2533 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16061797 Change-Id: I2fbe89900f64804c7bc325007ba8f29a3dc53e48
2021-10-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0acf3638bf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16061796 Change-Id: I2ce4713b66302abaa4603ecbb9961722fff6e4dd
2021-10-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id1decbc33d829e3c2d4496f91fc1cc46b978c12e
2021-10-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I528a66c19d7e590b2dc8cdbdbfd8e1615b11f575
2021-10-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie5f050f9ebb0ddf9d1608c1955abd21e6b4a8c19
2021-08-13API level 30 upgrade: PhotoTable am: e385bb2d81 am: d5a6f105b6Damian Patel
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/15528425 Change-Id: Iaeedd9f1af11781048809940c10c9baa9c1549f0
2021-08-13API level 30 upgrade: PhotoTable am: e385bb2d81Damian Patel
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/15528425 Change-Id: I132cdf808a251f89c41aa5d5bef2fb69d4e7200c
2021-08-11API level 30 upgrade: PhotoTableDamian Patel
The AndroidManifest.xml file of PhotoTable has been upgraded such that its targetSdkVersion is now 30. Test: manual BUG: 192337956 Change-Id: I170f459a2a1a64612b4188a0746645c588dc54fa
2021-07-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c4279b38dd -s ours am: 20169d2e3d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/15376009 Change-Id: I057881a4bbc8626806e6e371c3fcd509f9122da1
2021-07-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1ef3479e4b -s ours am: f720282c12 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/15376007 Change-Id: Iec1b8957ba0951df20e79a1fb3fe6e4d6e49a3c2
2021-07-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
72932636dc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/15379811 Change-Id: I7105ce7115d7da2eab43e326965617acdeb5a481
2021-07-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android12-devBill Yi
c4279b38dd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/15376009 Change-Id: I2f67aa3f0da62ee85735c1ac5e4c0dc93a531a25
2021-07-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1ef3479e4b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/15376007 Change-Id: Ie9eb29b7ec25091b2e71eafbe779541bebd4393d
2021-07-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie37ba4858156ad96af33505fb644c519bca26062
2021-07-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6f60a9c862a627f6e43488a60de08f9112b9126e
2021-07-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib1f997047ce37dc93de5c4e4f22b664bc0de9308
2021-07-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I62879f41abca808a6b2095977460d88b96cf2b0e
2021-06-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9ef31b9e28 -s ours am: 424354eda1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14981415 Change-Id: Iba88d06c1b6442d434494680f9909239b4773efd
2021-06-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
675d7d8bb0 -s ours am: 3ed28ab8d8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14972579 Change-Id: I3c6c25cf4994416903f5164488d0273c4795caed
2021-06-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c7556efd6f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14981417 Change-Id: I123812fb49f177c5a2aa61a45c47ba1a74716792
2021-06-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9ef31b9e28 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14981415 Change-Id: I35b13f6204d93fde8d6ea1cd4e63a90a4533da62
2021-06-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
675d7d8bb0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14972579 Change-Id: I8607cc87125019db447b92817436330fcbb05ddf
2021-06-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5778c233e0dd48265b35dd5b2d1cb4d649b25031
2021-06-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I221abcfd76953a75b8cc8f983edbc2e822be1917
2021-06-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I20dfa73fa9c3e897af7d7df9df81aa2cca70ff75
2021-06-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3bbd4518496837f65b9b92f6f0520722a814c107
2021-04-22[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
8d604bf500 -s ours am: 4741c612a0 -s ours am: 5639965e81 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1684107 Change-Id: Ic9fead783d4a98346d47603836aa91d9174fd19e
2021-04-22[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
8d604bf500 -s ours am: 4741c612a0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1684107 Change-Id: Ibe784685ed413ee22596be043ce2ad64cb042fe2
2021-04-22[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
8d604bf500 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1684107 Change-Id: I750bf97c5fcc2f1619e2a17e5870dc6562612452
2021-04-22Merge "Import translations. DO NOT MERGE ANYWHERE"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ifb624eeea355b9f2156b58b936962e6cfb4a3884
2021-04-13[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
604ec38237 -s ours am: dc2b5e7958 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14166192 Change-Id: I3e2d8ed0cb9dccf85863795f64f8b8adc1eed11c
2021-04-13[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
604ec38237 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14166192 Change-Id: I2ecd25a0f92bebc293a5599b1541eb4870774784
2021-04-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If02612c4a49504305a85f9a909c63a9b574146b3
2021-04-09[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
088fce679e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14142240 Change-Id: Iabccc64c5a5d2d98a3c9a1a2ff4e8f43949c6aa9
2021-04-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I87ebc402f11379aa28a3be3e637a1310149d546b
2021-03-31Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia81dbe0e5b9d0c8ec1f00cc95d1a76ad276a8b81
2021-03-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e939f88ada -s ours am: ddf6f181d4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14009682 Change-Id: I194b27aa0ae2457840f8a7ad1326bd9fc2f59cc8
2021-03-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵temp_ab_7272582Bill Yi
e939f88ada -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/14009682 Change-Id: Id973209ac1bae22f4711ac52a5de79823f1d4e9c
2021-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5a737f5c5ed5e2f126dfaa316fa5818233328c4f
2021-03-23[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7a674c9151 -s ours am: 13d7b7849d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/13963580 Change-Id: I27889d5887143ff3e1022b2a7e8f48e3ff1c947f