aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am...•••am: 3be975240e -s ours am skip reason: subject contains skip directive Change-Id: Ife6a0d363fb4753f04285bbe3553f14b9a19c378 Bill Yi2019-04-060-0/+0
|\
| * [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev•••am: 9db1319d77 -s ours am skip reason: subject contains skip directive Change-Id: Iaee14a03484ebec30262e1b88ae89886bd65f83d Bill Yi2019-04-060-0/+0
| |\
| | * Merge "Import translations. DO NOT MERGE" into qt-devTreeHugger Robot2019-04-077-13/+13
| | |\
| | | * Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7437c061744c3a3ff86c6b476ac1a87525fc74d8 Bill Yi2019-04-057-13/+13
* | | | [automerger skipped] Import translations. DO NOT MERGE am: 4be998498e -s ours•••am: a7863f7aac -s ours am skip reason: subject contains skip directive Change-Id: I10bc7897683423d4f077bf4cad7fd473ad334e07 Bill Yi2019-04-060-0/+0
|\| | |
| * | | [automerger skipped] Import translations. DO NOT MERGE•••am: 4be998498e -s ours am skip reason: subject contains skip directive Change-Id: I8c25026d42e2fb767a5924dc8c4b69501c7fc8a4 Bill Yi2019-04-060-0/+0
| |\| | | | |/ | |/|
| | * Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic1c492d7ebd6718099bc2b12f3daed09596218cd Bill Yi2019-04-052-4/+4
| |/
* | Merge master@5406228 into git_qt-dev-plus-aosp.•••am: 962939f895 Change-Id: I746cc4c978228036ef8fbdec6f17e56d84181c92 Bill Rassieur2019-04-030-0/+0
|\ \ | |/ |/|
| * Merge master@5406228 into git_qt-dev-plus-aosp.•••Change-Id: I4c4051a94c6d4d5db5eda6a6ef373ef161e21e1a BUG: 129345239 Bill Rassieur2019-03-291-2/+2
| |\
* | \ [automerger skipped] Import translations. DO NOT MERGE am: 145808acad -s ours•••am: 7eff036f7d -s ours am skip reason: subject contains skip directive Change-Id: I3274d09fd69e725b4509a6999fb3202e6d4c4c47 Bill Yi2019-03-270-0/+0
|\ \ \ | |_|/ |/| |
| * | [automerger skipped] Import translations. DO NOT MERGE•••am: 145808acad -s ours am skip reason: subject contains skip directive Change-Id: Ie5059b38c3e176cb660f54eb406027a60ded0d01 Bill Yi2019-03-270-0/+0
| |\ \
| | * | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I5d712356e5bc9cc77bbaa3a1f65ecdef6284b4a8 Bill Yi2019-03-261-2/+2
* | | | Import translations. DO NOT MERGE•••Change-Id: I4f02f5f4ccc6ff864fb5120dc7766755fb773fcf Auto-generated-cl: translation import Bill Yi2019-03-231-2/+2
| |_|/ |/| |
* | | Merge stage-aosp-master into pi-dev-plus-aosp•••am: 9cd8eb5a9a Change-Id: Ic1bd83a30eadb9b253e52ad5fac8c961df21bfcb Xin Li2019-02-250-0/+0
|\| |
| * | Merge stage-aosp-master into pi-dev-plus-aosp•••Bug: 126125118 Change-Id: I62739cff8c2223b4c5d8fef4565fba74c65067f8 Xin Li2019-02-250-0/+0
| |\ \
| | * \ DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master•••Bug: 120848293 Change-Id: I0ce28bf5229c1f1c98a51d86c2eaa15ec9efa73e Xin Li2019-02-2179-221/+221
| | |\ \
* | | \ \ Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-215-14/+14
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGE•••Change-Id: I48a6f3055d8dd3182ff98a6edace3a4e35b4326d Auto-generated-cl: translation import Bill Yi2019-02-215-14/+14
* | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am...•••am: d2a0448138 -s ours am skip reason: subject contains skip directive Change-Id: I5dac1e824a246811caacfbb65e2011ef957eeda0 Bill Yi2019-02-210-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev•••am: 289a72634b -s ours am skip reason: subject contains skip directive Change-Id: I4b8e3e2002bef629f14c741ffdf26f9f585ae4cf Bill Yi2019-02-210-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-211-179/+179
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I136d94f85222806b5104a16b6d544dc1c377c5e3 Bill Yi2019-02-211-179/+179
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am...•••am: 6c7f0252df -s ours am skip reason: subject contains skip directive Change-Id: I3d180cc20756e2d1cdb84962091917c6e41c759c Bill Yi2019-02-210-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev•••am: 624bac2cd8 -s ours am skip reason: subject contains skip directive Change-Id: I39a6eb25425d7d6a5d9f0b9b6c93d398aec3d7ce Bill Yi2019-02-210-0/+0
| |\| | | | |
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-211-4/+4
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9edb7e3ebf58bdf8fe5b12096c37815e58a39e40 Bill Yi2019-02-211-4/+4
| | | |/ / / /
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am...•••am: ecce81d600 -s ours am skip reason: subject contains skip directive Change-Id: Ib24e686e22f6b35dac4cf4c47f9566cf4456ce79 Bill Yi2019-02-210-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev•••am: a921223fe2 -s ours am skip reason: subject contains skip directive Change-Id: I27620645836d7e3e26894cbbff72e92cd1e54d9d Bill Yi2019-02-210-0/+0
| |\| | | | |
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-212-74/+74
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7809654384cc42e87999e222316e25f4bd70641f Bill Yi2019-02-212-74/+74
| | | |/ / / /
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am...•••am: 151132139a -s ours am skip reason: subject contains skip directive Change-Id: If54c7cafbf92792da641a840a64d642cda4b37ad Bill Yi2019-02-210-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev•••am: 01900e65fc -s ours am skip reason: subject contains skip directive Change-Id: I01f062132b5b6b40de3f532a0b4c48da14ffa0c9 Bill Yi2019-02-210-0/+0
| |\| | | | |
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-212-1286/+1286
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6e496165fde5ea66dda1559f39a0c02c949265b0 Bill Yi2019-02-212-1286/+1286
| | | |/ / / /
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am...•••am: 1513b865a7 -s ours am skip reason: subject contains skip directive Change-Id: Ib9f2f8a6631c4eaf7cca7688379393216aa681c2 Bill Yi2019-02-210-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev•••am: e951835344 -s ours am skip reason: subject contains skip directive Change-Id: I9b53ac21775b9611c5eb407f9619f51851b55aea Bill Yi2019-02-210-0/+0
| |\| | | | |
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-211-1/+1
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ied44fc2e6b9256a6744387ca511946b21fd44524 Bill Yi2019-02-211-1/+1
| | | |/ / / /
* | | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am...•••am: 8c9163d180 -s ours am skip reason: subject contains skip directive Change-Id: I947826e9c2224d223d526c96c64dc4f5ca2c3251 Bill Yi2019-02-210-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev•••am: 35ac417ae0 -s ours am skip reason: subject contains skip directive Change-Id: Iddece47182ff08386f7bcaa402c74eeaca57a693 Bill Yi2019-02-210-0/+0
| |\| | | | |
| | * | | | | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2019-02-211-8/+8
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I05cf27d7d1a197dde37d6dc69433c26e62c88458 Bill Yi2019-02-211-8/+8
| | | |/ / / /
* | | | | | | [automerger skipped] Import translations. DO NOT MERGE am: 9e73c487e4 -s ours•••am: 1079e974a3 -s ours am skip reason: subject contains skip directive Change-Id: Icfb741e61c196da6ada12373682ed5ac16d045b2 Bill Yi2019-02-210-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Import translations. DO NOT MERGE•••am: 9e73c487e4 -s ours am skip reason: subject contains skip directive Change-Id: I36af548ea6984fda2645809575e5b9566b163308 Bill Yi2019-02-210-0/+0
| |\| | | | |
| | * | | | | Import translations. DO NOT MERGE•••Auto-generated-cl: translation import Bug: 64712476 Change-Id: I2b984642494033f59d02cf4c640793b47e63c6b3 Bill Yi2019-02-214-193/+193
| | |/ / / /
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-212-2/+2
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGE•••Change-Id: I3962401c95664f199216b443e27bf07871b20d07 Auto-generated-cl: translation import Bill Yi2019-02-212-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-212-6/+6
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGE•••Change-Id: Iaaf42624b7933d8a479a9eea71aedbc3711de6cb Auto-generated-cl: translation import Bill Yi2019-02-212-6/+6
| |/ / / / /
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2019-02-212-4/+4
|\ \ \ \ \ \