aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-04-121-2/+2
|\
| * Import translations. DO NOT MERGEBill Yi2019-04-111-2/+2
| | | | | | | | | | Change-Id: I065b01ebce821dd835cc419f43c632d3cbf225cc Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2019-04-1114-31/+31
|/ | | | | Change-Id: Ic89513e1d17e006229ff037a0b26828b47a30f7d Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-04-081-1/+1
|\
| * Import translations. DO NOT MERGEBill Yi2019-04-081-1/+1
| | | | | | | | | | Change-Id: I88307c88d211620bd51cd6ef8a760fc585378517 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2019-04-081-1/+1
|/ | | | | Change-Id: Ibd4590bf1cbe976ba97e3d4c0f8373fe008e6f27 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-04-072-4/+4
|\
| * Import translations. DO NOT MERGEBill Yi2019-04-052-4/+4
| | | | | | | | | | Change-Id: Id4513ea623403b0edceebf4a80d0cccbcefa3713 Auto-generated-cl: translation import
* | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2019-04-070-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 7209c0f074 -s ours am: 274710bcc0 -s ours am: 95d5b957a1 -s ours am skip reason: subject contains skip directive Change-Id: I492db92bf87309f2cb3121f023e678d8fc0e5f17
| * \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2019-04-070-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7209c0f074 -s ours am: 274710bcc0 -s ours am skip reason: subject contains skip directive Change-Id: Ie325587662f1430aad3e3ad87937686ed3f25045
| | * \ [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2019-04-070-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7209c0f074 -s ours am skip reason: subject contains skip directive Change-Id: I051a990a28d9bdcf458bb8889e3394fcb45903c4
| | | * \ Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-04-072-4/+4
| | | |\ \
| | | | * | Import translations. DO NOT MERGEBill Yi2019-04-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I37bb584aec85ed5299a8033b75b81b330a2ab783
* | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 990b77d2b8 -s ↵Bill Yi2019-04-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 050b948ca8 -s ours am: e66f9264cd -s ours am skip reason: subject contains skip directive Change-Id: Ie457c4eccdce08f8a0b32c4577b65f3a6c1aaf43
| * | | | | [automerger skipped] Import translations. DO NOT MERGE am: 990b77d2b8 -s oursBill Yi2019-04-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 050b948ca8 -s ours am skip reason: subject contains skip directive Change-Id: Ibeb7b84b0c2aa376e1cf1d7cd20449f713f477d3
| | * | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-04-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 990b77d2b8 -s ours am skip reason: subject contains skip directive Change-Id: Ie2226ecc6616bc99ffb5acf575f5a1f596debb42
| | | * | | Import translations. DO NOT MERGEBill Yi2019-04-057-13/+13
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6539176814c71b06abe32ee6b8205f9500ed50f9
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-04-077-13/+13
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2019-04-057-13/+13
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Change-Id: If065e19b8eb151a87285dd390c2dca5213d216a3 Auto-generated-cl: translation import
* | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev ↵Bill Yi2019-04-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9db1319d77 -s ours am: 3be975240e -s ours am skip reason: subject contains skip directive Change-Id: Ife6a0d363fb4753f04285bbe3553f14b9a19c378
| * | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-devBill Yi2019-04-060-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | am: 9db1319d77 -s ours am skip reason: subject contains skip directive Change-Id: Iaee14a03484ebec30262e1b88ae89886bd65f83d
| | * | | Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-04-077-13/+13
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2019-04-057-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7437c061744c3a3ff86c6b476ac1a87525fc74d8
* | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 4be998498e -s oursBill Yi2019-04-060-0/+0
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | am: a7863f7aac -s ours am skip reason: subject contains skip directive Change-Id: I10bc7897683423d4f077bf4cad7fd473ad334e07
| * | | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-04-060-0/+0
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | | | | | am: 4be998498e -s ours am skip reason: subject contains skip directive Change-Id: I8c25026d42e2fb767a5924dc8c4b69501c7fc8a4
| | * | Import translations. DO NOT MERGEBill Yi2019-04-052-4/+4
| |/ / | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic1c492d7ebd6718099bc2b12f3daed09596218cd
* | | Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
|\ \ \ | |/ / |/| | | | | | | | | | | am: 962939f895 Change-Id: I746cc4c978228036ef8fbdec6f17e56d84181c92
| * | Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-03-291-2/+2
| |\ \ | | | | | | | | | | | | | | | | Change-Id: I4c4051a94c6d4d5db5eda6a6ef373ef161e21e1a BUG: 129345239
* | \ \ [automerger skipped] Import translations. DO NOT MERGE am: 145808acad -s oursBill Yi2019-03-270-0/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | am: 7eff036f7d -s ours am skip reason: subject contains skip directive Change-Id: I3274d09fd69e725b4509a6999fb3202e6d4c4c47
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2019-03-270-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | am: 145808acad -s ours am skip reason: subject contains skip directive Change-Id: Ie5059b38c3e176cb660f54eb406027a60ded0d01
| | * | Import translations. DO NOT MERGEBill Yi2019-03-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I5d712356e5bc9cc77bbaa3a1f65ecdef6284b4a8
* | | | Import translations. DO NOT MERGEBill Yi2019-03-231-2/+2
| |_|/ |/| | | | | | | | | | | Change-Id: I4f02f5f4ccc6ff864fb5120dc7766755fb773fcf Auto-generated-cl: translation import
* | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | | | | | | | | | | | | | | | am: 9cd8eb5a9a Change-Id: Ic1bd83a30eadb9b253e52ad5fac8c961df21bfcb
| * | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ \ | | | | | | | | | | | | | | | | Bug: 126125118 Change-Id: I62739cff8c2223b4c5d8fef4565fba74c65067f8
| | * \ DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-2179-221/+221
| | |\ \ | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I0ce28bf5229c1f1c98a51d86c2eaa15ec9efa73e
* | | \ \ Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-215-14/+14
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2019-02-215-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48a6f3055d8dd3182ff98a6edace3a4e35b4326d Auto-generated-cl: translation import
* | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2019-02-210-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 289a72634b -s ours am: d2a0448138 -s ours am skip reason: subject contains skip directive Change-Id: I5dac1e824a246811caacfbb65e2011ef957eeda0
| * | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2019-02-210-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 289a72634b -s ours am skip reason: subject contains skip directive Change-Id: I4b8e3e2002bef629f14c741ffdf26f9f585ae4cf
| | * | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-211-179/+179
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEBill Yi2019-02-211-179/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I136d94f85222806b5104a16b6d544dc1c377c5e3
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2019-02-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 624bac2cd8 -s ours am: 6c7f0252df -s ours am skip reason: subject contains skip directive Change-Id: I3d180cc20756e2d1cdb84962091917c6e41c759c
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2019-02-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 624bac2cd8 -s ours am skip reason: subject contains skip directive Change-Id: I39a6eb25425d7d6a5d9f0b9b6c93d398aec3d7ce
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-211-4/+4
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-211-4/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9edb7e3ebf58bdf8fe5b12096c37815e58a39e40
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2019-02-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a921223fe2 -s ours am: ecce81d600 -s ours am skip reason: subject contains skip directive Change-Id: Ib24e686e22f6b35dac4cf4c47f9566cf4456ce79
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2019-02-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a921223fe2 -s ours am skip reason: subject contains skip directive Change-Id: I27620645836d7e3e26894cbbff72e92cd1e54d9d
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-212-74/+74
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBill Yi2019-02-212-74/+74
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7809654384cc42e87999e222316e25f4bd70641f
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi2019-02-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 01900e65fc -s ours am: 151132139a -s ours am skip reason: subject contains skip directive Change-Id: If54c7cafbf92792da641a840a64d642cda4b37ad