aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2018-08-0513-18/+18
|\
| * Import translations. DO NOT MERGEBill Yi2018-08-0413-18/+18
| | | | | | | | | | Change-Id: I3aa89ae1670744014b169157832143e462dfaf4f Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBill Yi2018-08-0437-136/+136
|/ | | | | Change-Id: Ia192cb1acf2491b2e5ab43c42afdac1f23417ef4 Auto-generated-cl: translation import
* Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-0839-86/+6320
|\ | | | | | | | | Bug: 79597307 Change-Id: I76aba51f6b8badf493af7f7c5311cc4d64ae92da
| * [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-06-040-0/+0
| |\ | | | | | | | | | | | | | | | am: 5223e55714 -s ours Change-Id: Idad46c75f15d0c86502a6da620729217798fbe66
| | * Import translations. DO NOT MERGEBill Yi2018-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Idfabfb70bd18c49a7c22d374d3679682228e9a6f
| * | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-250-0/+0
| |\| | | | | | | | | | | | | | | | am: 6f52cfc821 -s ours Change-Id: Ie9432dc64b559b374b19eeeb935f7ef7068c1ab3
| | * Import translations. DO NOT MERGEBill Yi2018-05-242-6/+6
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ie39b03988909ff74c926f29324818007de3c624b
| * | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-230-0/+0
| |\| | | | | | | | | | | | | | | | am: 1896f3436b -s ours Change-Id: I01e54375e0cc37def80a199a8ce2fbeb8fb37865
| | * Import translations. DO NOT MERGEBill Yi2018-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ie24f420e99418085e9c202fdea3dac9773fb30a5
| * | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-05-200-0/+0
| |\| | | | | | | | | | | | | | | | am: 2435eb87ba -s ours Change-Id: I93b6417a13e9682cc29befcd41ce97db5e81b06b
| | * Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-05-201-1/+1
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I0e9cf9c7d530ee93b2ffdeb219971660e87bfe18
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: cf0305126e -s ours Change-Id: Iab985c4b58208fbd669d79468895e1673e95ead9
| | * | Import translations. DO NOT MERGEBill Yi2018-05-203-5/+5
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I7a1a6a0b898a05da415b67c0e963bb32122c850f
| * | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-05-060-0/+0
| |\| | | | | | | | | | | | | | | | am: 2d86f24cb0 -s ours Change-Id: Ifd794f379dd0c178cbe2d6fbbeaeaf7b70226345
| | * Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-05-071-1/+1
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Idcaaccff8ab717edfc84ed27e30b9b0a3288ba10
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-05-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 7a51bb5a4f -s ours Change-Id: I7ef3f02d52d77ad75ae1a315f4a5a48737a1da7a
| | * | Import translations. DO NOT MERGEBill Yi2018-05-032-3/+3
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I8dd583f9628d0e0caa5a45cc646688f1fbc2ea08
| * | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | am: 12afc16019 -s ours Change-Id: I3dfc4eba9811bee854361e94f006723a57f6008f
| | * Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-2819-53/+53
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-04-2719-53/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1fa1dd1a62e97fb595a9004edf1d69071d2bdce8
| * | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: a282948754 -s ours Change-Id: I8140f4284b9e74cb9c9c7111a9c1237a38356dc0
| | * | Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-283-5/+5
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2018-04-273-5/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6f68e016f4e4206d43fb5a659ddfab21184f6910
| * | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 72de6118a9 -s ours Change-Id: I7e161b0565a5686924970a067c86790b3af035b3
| | * | Merge "Import translations. DO NOT MERGE" into pi-devandroid-build-team Robot2018-04-281-1/+1
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2018-04-271-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1803419e91e88e1601df974ba87495671de1049d
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 2ff803e2a3 -s ours Change-Id: I3da270d8b7e15a5797483b724227de07cb1cf2fe
| | * | Import translations. DO NOT MERGEBill Yi2018-04-271-1/+1
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic5a4c6c9cda95d912d75bcc49da8656571d4d14b
| * | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-170-0/+0
| |\| | | | | | | | | | | | | | | | am: 0262bf8793 -s ours Change-Id: I850b67608222ab07dc68494a98a95940643bb046
| | * Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-172-21/+21
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-04-172-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic07e1affb14655e1e0d5fe82ffb4fcfc063afd08
| * | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: ae571ef6e3 -s ours Change-Id: I6381866dfd5c67d0d94954474dd15b23f1d6aa7e
| | * | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-179-19/+19
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2018-04-179-19/+19
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ifb115e7b8384e9ba72aa7c33daa8a79fa1b3b339
| * | | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 4b3d9d53c2 -s ours Change-Id: I6f3cfd39b23c1488313249596a4b8fd366de32fe
| | * | Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-171-1/+1
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2018-04-171-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I060b9121b992698d1874db2c0854a15f2291d932
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-04-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: b251eda396 -s ours Change-Id: Idf1027330f47b5ed6eeb22c3e9d81f975d655c57
| | * | Import translations. DO NOT MERGEBill Yi2018-04-171-1/+1
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: If17184d1bc05e2159b1a7bdcb452d807454799e3
| * | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-140-0/+0
| |\| | | | | | | | | | | | | | | | am: 957cdc0856 -s ours Change-Id: I3fa7ae96db0c92fdf14954f637dabfb98639c778
| | * Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-143-4/+4
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-04-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I90541c9acb250a7f8d98aeab2d6c0756142dde8a
| * | | [automerger skipped] Import translations. DO NOT MERGEBill Yi2018-04-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 33aa180429 -s ours Change-Id: I99cb25bf5d0bbd3f1d731097f645f660c46c158a
| | * | Import translations. DO NOT MERGEBill Yi2018-04-149-18/+18
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I257b570a61999ba1cc5b4eeb9097395ddf542387
| * | [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi2018-04-130-0/+0
| |\| | | | | | | | | | | | | | | | am: cfb0e05e03 -s ours Change-Id: I4d55d8e34bb8b1f0bdd9d5ec9b2f6cf5d4852022
| | * Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot2018-04-132-2/+2
| | |\
| | | * Import translations. DO NOT MERGEBill Yi2018-04-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: If78ee30938b0099157545e9344bf833e87666380