aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Import translations. DO NOT MERGE am: 72b1a8b722 -s ↵Bill Yi2019-08-190-0/+0
|\ | | | | | | | | | | | | | | | | ours am: 66b32daac4 -s ours am: 9d13cc5de0 -s ours am skip reason: subject contains skip directive Change-Id: I87ed8010af35abc4a80f5e5559bcecc7871d6af0
| * [automerger skipped] Import translations. DO NOT MERGE am: 72b1a8b722 -s oursBill Yi2019-08-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | am: 66b32daac4 -s ours am skip reason: subject contains skip directive Change-Id: I94a2b591226caeb89e24a7c138c49b4b58aff45b
| | * [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-08-190-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: 72b1a8b722 -s ours am skip reason: subject contains skip directive Change-Id: I3146a2b640d9fd6e5c12886d0a8bf7c725200d72
| | | * Import translations. DO NOT MERGEBill Yi2019-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I576eae018336f225d9e6c9dce6eaba6742ce9581
* | | | [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li2019-08-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5713463) in stage-aosp-master am: 7748102af1 -s ours am: b88a8516f3 am: e548aec3fe am: 197cf7dad0 -s ours am skip reason: subject contains skip directive Change-Id: I7f9d7180172038c83cd8c1f87541b213a8bc7004
| * | | [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li2019-08-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5713463) in stage-aosp-master am: 7748102af1 -s ours am: b88a8516f3 am: e548aec3fe Change-Id: I90fb7c7ed25ef5e46793d7654cdbb09edd4b1e13
| | * | [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li2019-08-140-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5713463) in stage-aosp-master am: 7748102af1 -s ours am: b88a8516f3 Change-Id: I08f2b2c10621f4322ce59bea7c30a336707de79d
| | | * \ [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li2019-08-140-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5713463) in stage-aosp-master am: 7748102af1 -s ours am skip reason: subject contains skip directive Change-Id: I1229451d40fb142f3f46e591e1dadc652b232685
| | | | * \ DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in ↵Xin Li2019-08-140-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 134405016 Change-Id: I85024313e36aa6450602dd17cd9bcd7220780ecd
* | | | | | | Import translations. DO NOT MERGEBill Yi2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie360fef58d520aab88d9ac91fcd241f9dd2dbbb2 Auto-generated-cl: translation import
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-r1-dev am: cd95311674 -s ours am: 1080d669ab -s ours am: 1e4d00401d -s ours am skip reason: subject contains skip directive Change-Id: I98f6f5fd94bc895ed017d6e79ea3ed708e076e65
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-07-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-r1-dev am: cd95311674 -s ours am: 1080d669ab -s ours am skip reason: subject contains skip directive Change-Id: Ibec5e92190b0151678c401d7ee8dc9417c63194b
| | * | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-07-240-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cd95311674 -s ours am skip reason: subject contains skip directive Change-Id: Ieef0e13f6154015f45f2f5dfa1204eaf40f116a1
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-r1-dev am: cd95311674 -s ours am: c83cc88f9b -s ours am: ab260ffa84 -s ours am skip reason: subject contains skip directive Change-Id: I04ccbe1223307fe3e0151a5a9cd98d04b1d6db61
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-07-240-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-r1-dev am: cd95311674 -s ours am: c83cc88f9b -s ours am skip reason: subject contains skip directive Change-Id: I179b15a6ffc24831696d28e86ffba7d145c8f0e8
| | * \ \ \ \ \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-07-240-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cd95311674 -s ours am skip reason: subject contains skip directive Change-Id: I78c9b535c5596c089be47a8a06e2e7b309d244f6
| | | * | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-07-252-2/+2
| | | |\ \ \ \ \
| | | | * | | | | Import translations. DO NOT MERGEBill Yi2019-07-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Iae08b9b0a5055f1c29a678764af6d2f3c849d5ec
* | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: ce1f65074a -s ↵Bill Yi2019-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 33dec1203c -s ours am: 80fa2bdcf9 -s ours am skip reason: subject contains skip directive Change-Id: I44a71c21fccb42b7b847add81c78e7ebde412a30
| * | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: ce1f65074a -s oursBill Yi2019-07-240-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33dec1203c -s ours am skip reason: subject contains skip directive Change-Id: Ie122c64d041547d05d605b0422b54a44ff5cf943
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-07-240-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ce1f65074a -s ours am skip reason: subject contains skip directive Change-Id: Ie99440bbe2c1cb64b9f4e3e714a5178b95e25b3e
* | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: ce1f65074a -s ↵Bill Yi2019-07-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 2792b8483c -s ours am: f65b7bbaf9 -s ours am skip reason: subject contains skip directive Change-Id: I971adb3c569607da7a5724da34904d2a45f0d8d5
| * | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: ce1f65074a -s oursBill Yi2019-07-240-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | am: 2792b8483c -s ours am skip reason: subject contains skip directive Change-Id: I1d600d83f85e13fbbc7c924a7efc546f768c79b7
| | * | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-07-240-0/+0
| | |\| | | | | | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ce1f65074a -s ours am skip reason: subject contains skip directive Change-Id: I00d3f746e191d382557fabc0e68be9bbfc3c7a8c
| | | * | | | Import translations. DO NOT MERGEBill Yi2019-07-242-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I3dd765cbdc830f4e9d4f3dd8495f56a28d8938ba
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-07-212-3/+3
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2019-07-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice306f134cebf3e690c82a7b2d1323e3021e7980 Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBill Yi2019-07-201-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia43c3b9683afca77e14a783a540bb0544476cb9d Auto-generated-cl: translation import
* | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-07-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-r1-dev am: 64302ec808 -s ours am: b403889818 -s ours am skip reason: subject contains skip directive Change-Id: I2437556ccbcaf0d5595f3269a7b6f8fad12cf1b9
| * | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-07-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 64302ec808 -s ours am skip reason: subject contains skip directive Change-Id: Iff76b4aa4eea5461a0aabffcaef3ecd5ec180db4
| | * | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-07-146-16/+16
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEBill Yi2019-07-146-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ib15edbefa78b413711bc9a114c035e4f042029d8
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-07-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-r1-dev am: c5999bd8d7 -s ours am: 51eaf198ef -s ours am skip reason: subject contains skip directive Change-Id: I7dafb531aafde66c3cb48163f80e2b3578410828
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-07-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c5999bd8d7 -s ours am skip reason: subject contains skip directive Change-Id: Ia07d690ca858b4d3558e0fba9e57fa291d53e3fc
| | * | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-07-142-2/+2
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBill Yi2019-07-142-2/+2
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I5d3e002b9c8b5b9163674ee55b0a78c86d7a4367
* | | | | | | Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-07-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-dev am: ab46c2ff33 -s ours am: d61e6b5090 -s ours am: 0c9c6226ed -s ours am skip reason: subject contains skip directive Change-Id: I2053fa0858c71d055f425b39b1988400dba49b70
| * | | | | | Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Android Build Merger (Role)2019-07-140-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | qt-dev am: ab46c2ff33 -s ours am: d61e6b5090 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
| | * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-07-140-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ab46c2ff33 -s ours am: d61e6b5090 -s ours am skip reason: subject contains skip directive Change-Id: Ic5196482d572ad09a5918b6c63b8dd2bc9e76be1
| | | * | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-07-140-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ab46c2ff33 -s ours am skip reason: subject contains skip directive Change-Id: I82565b5a973742014900769bd382fb17a001ab52
* | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-07-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ab46c2ff33 -s ours am: 362501b8f6 -s ours am: 603754f293 -s ours am skip reason: subject contains skip directive Change-Id: I9e9a8b917e7237eb100db629a68a6f3cbccf283e
| * | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-07-140-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ab46c2ff33 -s ours am: 362501b8f6 -s ours am skip reason: subject contains skip directive Change-Id: Ia5de6bb421696cf6cea9165469e0d46f272cde25
| | * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-07-140-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ab46c2ff33 -s ours am skip reason: subject contains skip directive Change-Id: Iae288cd40fb18689cac622310b84e7ef2488888c
| | | * | | | | Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-07-146-16/+16
| | | |\ \ \ \ \
| | | | * | | | | Import translations. DO NOT MERGEBill Yi2019-07-136-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I613207e83ccb3a460ea770af79796d4addc01839
* | | | | | | | | Merge "[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 ↵Bill Yi2019-07-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: e3d501996e -s ours am: 24d4024df1 -s ours am skip reason: subject contains skip directive Change-Id: I31c84a13ebde95fffa104e7d21aeed4398df5e65
| * | | | | | | | Merge "[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 ↵Android Build Merger (Role)2019-07-140-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: e3d501996e -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
| | * | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 -s oursBill Yi2019-07-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e3d501996e -s ours am skip reason: subject contains skip directive Change-Id: Id126adca02db4531eed9de1ff28b90875d3c3571
| | | * | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-07-130-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cdd65daaa1 -s ours am skip reason: subject contains skip directive Change-Id: I6f594a3b08adc6905b702fb304d94cd3ae316eaa
* | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 -s ↵Bill Yi2019-07-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 7b644d7f78 -s ours am: 204c916181 -s ours am skip reason: subject contains skip directive Change-Id: Ifd67e2560c0aac749400decff59215e388c64ec0