aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4061ed5736 -s ours am skip reason: subject contains skip directive Change-Id: I32a36bccba7d89c4b87599cf431f335a139256cd
* | | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4061ed5736 -s ours am: 79209927d7 -s ours am: 253e96a6ef -s ours am skip reason: subject contains skip directive Change-Id: Ia8e28017a1613326698c8ce80da38021332f2945
| * | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4061ed5736 -s ours am: 79209927d7 -s ours am skip reason: subject contains skip directive Change-Id: Iee460ee20e3b7883819b86b194d6752957406e17
| | * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4061ed5736 -s ours am skip reason: subject contains skip directive Change-Id: I2bc82d808c258bdab168afa691d2a6415e597efb
| | | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-06-261-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I38b91f6946820fcaa1f28323085f54676ce12615
* | | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ↵Bill Yi2019-06-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 840c5538d5 -s ours am: 2a4aba0879 -s ours am skip reason: subject contains skip directive Change-Id: Iea8a6a26c95686c4e13daa137d6b9a87723cc0de
| * | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s oursBill Yi2019-06-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 840c5538d5 -s ours am skip reason: subject contains skip directive Change-Id: I8c144db8e7e390ed19ae1d05280323b974b8fb6d
| | * | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-250-0/+0
| | |\| | | | | | | | | | | | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9b767fcba3 -s ours am skip reason: subject contains skip directive Change-Id: Ia93571e75a307e18be9afe5898adc1dff1f25df7
* | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ↵Bill Yi2019-06-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: f9c445788b -s ours am: 8563a2027a -s ours am skip reason: subject contains skip directive Change-Id: Icad87bed014583309c3a48e88107bd970b0064df
| * | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s oursBill Yi2019-06-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f9c445788b -s ours am skip reason: subject contains skip directive Change-Id: Ieaa7f260fdab2f969b7bf0807c04126c6bffed95
| | * | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9b767fcba3 -s ours am skip reason: subject contains skip directive Change-Id: I3b557b73a894482d524707d8db9522ab3d33aa64
| | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-251-1/+1
| | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I352b26ea8bf0231df70390d717acd2d1d594b1c5
* | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-r1-dev am: 946037ccaa -s ours am: df13f0a381 -s ours am skip reason: subject contains skip directive Change-Id: I8f637350f8bf23339f983ac162a448907a6dfe41
| * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 946037ccaa -s ours am skip reason: subject contains skip directive Change-Id: Iccfd98779dacb93191083c8cb50b8041899f30db
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-06-192-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I2d3706b2fa62b1f3b561db60763e895910b1cbbc
* | | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-r1-dev am: 00f42c18e7 -s ours am: 6aecddb456 -s ours am skip reason: subject contains skip directive Change-Id: I6f41923e4119d129afcd05b08bea01d856f124d1
| * | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-devBill Yi2019-06-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 00f42c18e7 -s ours am skip reason: subject contains skip directive Change-Id: I6a6fe8eb2230651eca9ffb05064320739b424481
| | * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-r1-devTreeHugger Robot2019-06-196-21/+21
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-186-21/+21
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I714e7c7937c2377d86ee7f2a514117d0255f4761
* | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 3c377f755c -s oursBill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 03ce994eec -s ours am skip reason: subject contains skip directive Change-Id: I8f60d02efbb6ef5d8ca867cbffc50c7be7cef61c
| * | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3c377f755c -s ours am skip reason: subject contains skip directive Change-Id: I0768f2db2bc24836891acc9fa2f00dd2ca0bd873
| | * | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-1821-42/+40
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I32470cb45f56eb8bdc8f2b2e055e649d34c5e7f3
* | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am: 474b6518de -s ours am: bbce6727cc -s ours am skip reason: subject contains skip directive Change-Id: I3cda11ed563d09237eb80db35ddee7ad3a09cdbc
| * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am: 474b6518de -s ours am skip reason: subject contains skip directive Change-Id: I5bf6291792086790a4e1179d35db194b737318cf
| | * | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am skip reason: subject contains skip directive Change-Id: I7715753ef974b79b2e62c4d14f6ec769284b095c
* | | | | | | | | | | | Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Bill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-dev am: 32bb8f9993 -s ours am: 0159a56eb0 -s ours am: 43a72fe360 -s ours am skip reason: subject contains skip directive Change-Id: I822bbde9af45981a03808d1c2972aaa04bdc53f5
| * | | | | | | | | | | Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Android Build Merger (Role)2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-dev am: 32bb8f9993 -s ours am: 0159a56eb0 -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-06-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am: 0159a56eb0 -s ours am skip reason: subject contains skip directive Change-Id: I6b2d10370d7102e02773b267a945d923c390e6a3
| | | * | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 32bb8f9993 -s ours am skip reason: subject contains skip directive Change-Id: Ifd17be5a20f5a1c9787d3f082238c7326ad9b88c
| | | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-06-182-3/+3
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I096be536dd6bf947ea5c2d2adb37a905a790027f
* | | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s ↵Bill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 20b7d15ae5 -s ours am: bfe418d5ef -s ours am skip reason: subject contains skip directive Change-Id: Ia68307ad98a2e2b413c785c57b179560b9f6cfe7
| * | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s oursBill Yi2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | / / / / / / / / | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 20b7d15ae5 -s ours am skip reason: subject contains skip directive Change-Id: I712e5cf4b4bfc28115f67148be5de233270676d8
| | * | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a9ee39f5cb -s ours am skip reason: subject contains skip directive Change-Id: I338ac5ff44723d97eda21fc992b2c20499ed84cc
* | | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s ↵Bill Yi2019-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 785f8a21a6 -s ours am: a6b2800ea9 -s ours am skip reason: subject contains skip directive Change-Id: I3300b4794d98269e83469f87b92105b315a0725f
| * | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s oursBill Yi2019-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 785f8a21a6 -s ours am skip reason: subject contains skip directive Change-Id: Idcf2355955d334ebdb1e7de98540727b195122a9
| | * | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a9ee39f5cb -s ours am skip reason: subject contains skip directive Change-Id: I2da24758f685408817dbe59a3af79c1930c6d19a
| | | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-182-3/+3
| | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id00265bae5aa6cd705f6b685dc5482cf28be48ef
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-06-091-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-081-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9794c1317480e86e594b4cff4333e5e72be86517 Auto-generated-cl: translation import
* | | | | | | | | | | | | Import translations. DO NOT MERGEBill Yi2019-06-0815-31/+29
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75d10c9ab3ed7c355483599c83157d20352a1712 Auto-generated-cl: translation import
* | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6562981448 -s ours am: 786dd43b9e -s ours am: 882969d4f5 -s ours am skip reason: subject contains skip directive Change-Id: I9909ae6aea36ee803c04f2fa13309df630691ba3
| * | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6562981448 -s ours am: 786dd43b9e -s ours am skip reason: subject contains skip directive Change-Id: If9d9679862a20f662574f2480fe3fb0668f106a4
| | * | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-06-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6562981448 -s ours am skip reason: subject contains skip directive Change-Id: Id88e74f86f38baf9132d4b64723e710b261e6906
* | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b -s ↵Bill Yi2019-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 29f347eef3 -s ours am: e1b0efcdc5 -s ours am skip reason: subject contains skip directive Change-Id: I08d5825e1bf759fe9ef6a01d4448cbfab1fc1163
| * | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: fef85b3c7b -s oursBill Yi2019-06-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 29f347eef3 -s ours am skip reason: subject contains skip directive Change-Id: I21b976b20b3c65f753f5ff2694c413bd7764eba9
| | * | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-06-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fef85b3c7b -s ours am skip reason: subject contains skip directive Change-Id: I1ce5a4c80d46736758d5502359de508d1253daa6
* | | | | | | | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6562981448 -s ours am: adb2e7a485 -s ours am: 29c40ed017 -s ours am skip reason: subject contains skip directive Change-Id: Iebdb8efc6f53ebae4d355105e6aba949c0b7572e