aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-300-0/+0
|\ | | | | | | | | | | am: 9006745cd0 -s ours Change-Id: I48b1ac28f2fb40508860cd34c92093c09d2f5638
| * Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-307-129/+1876
| |\
| | * Import translations. DO NOT MERGEBill Yi2017-08-307-129/+1876
| | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I9714ae0b53934a4f8d4c90f3aca3127b77ed6ac7
* | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-300-0/+0
|\| | | | | | | | | | | | | | | | | am: 3500677fec -s ours Change-Id: Id190d0e160b252fe5e020399f59cdae425f303c8
| * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-302-47/+255
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-08-302-47/+255
| | |/ | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I814dea39d3466c37ea0d65f06aee8d8a5a5f67c7
* | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-300-0/+0
|\| | | | | | | | | | | | | | | | | am: b99b77307d -s ours Change-Id: I0984955c92cd1ea6051123b6d5f808c432a047bf
| * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-305-39/+23
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-08-305-39/+23
| | |/ | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: Iffae1ebc381b3ecb54787906b386fdbd77f67565
* | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-300-0/+0
|\| | | | | | | | | | | | | | | | | am: 7507f50803 -s ours Change-Id: I3a38798c4df861e3ea7289302bf0bdb0b504cbd8
| * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-3011-102/+102
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-08-3011-102/+102
| | |/ | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I56e959285ad21b8fc18b5e424187bce5ace3555c
* | | Import translations. DO NOT MERGEBill Yi2017-08-300-0/+0
|\| | | | | | | | | | | | | | | | | am: 7e581e8c89 -s ours Change-Id: I411c6f43663cfd27b29b298841e55162cb9ad761
| * | Import translations. DO NOT MERGEBill Yi2017-08-301-1/+1
| |/ | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I4a7c58d64ce70044c75fa87d03ea329e46b6d4f9
* | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-150-0/+0
|\| | | | | | | | | | | am: 677620436a -s ours Change-Id: Ifa6d01d8eeafd911be853b3404ffc704cfcd4e58
| * Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-158-8/+1775
| |\
| | * Import translations. DO NOT MERGEBill Yi2017-08-158-8/+1775
| | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I967f2eaee996fef001829e3f296ae6126a2f5795
* | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-150-0/+0
|\| | | | | | | | | | | | | | | | | am: 341b700798 -s ours Change-Id: I1ac98361e408adf87b33befce1be9e71dd7b55be
| * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-159-33/+245
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-08-159-33/+245
| | |/ | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I219e4e535b56d722a1538b268f4d6bdc1ca12698
* | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-150-0/+0
|\| | | | | | | | | | | | | | | | | am: 4628ca1e0f -s ours Change-Id: I526c0050382d43014a2bc52e3cd908355e4ceb33
| * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-153-4/+212
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-08-153-4/+212
| | |/ | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I024b5594294af36cc9f90f3f036999adf09a4e90
* | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-150-0/+0
|\| | | | | | | | | | | | | | | | | am: 197deb104e -s ours Change-Id: If24b9f82c451e9fcb8b8ef972fbad8e063a5e137
| * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-151-0/+31
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-08-151-0/+31
| | |/ | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I5c64453869fe6c06d0f955fd8a1fde30728f9f1d
* | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-150-0/+0
|\| | | | | | | | | | | | | | | | | am: 702d5a75ba -s ours Change-Id: I25d007ab1c375d6a017375c30e1e164bc0ee206f
| * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-151-0/+27
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-08-151-0/+27
| | |/ | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I55e64146f9fc4bcd32cb3b3415ff99f4e3a6df73
* | | Merge "Import translations. DO NOT MERGE" into oc-mr1-devBill Yi2017-08-150-0/+0
|\| | | | | | | | | | | | | | | | | am: cb36b76ec4 -s ours Change-Id: I70703a7e83de969b33a962243176d313bd21b04b
| * | Merge "Import translations. DO NOT MERGE" into oc-mr1-devTreeHugger Robot2017-08-151-0/+24
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-08-151-0/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I988e9ae9d200fe64477323b3286a3bc81b79b51e
* | | Import translations. DO NOT MERGEBill Yi2017-08-150-0/+0
|\| | | | | | | | | | | | | | | | | am: c7f9428204 -s ours Change-Id: I1ae5c01d5e107d86aa84df165af106cc5211eb8d
| * | Import translations. DO NOT MERGEBill Yi2017-08-157-9/+105
| |/ | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: Id00030f0d4c8b0387defa14323c6c0e5d416d74c
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2017-08-070-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | cfc834197c -s ours am: 27d76ee0e9 -s ours am: bc47ef3c13 -s ours Change-Id: I875d1f7fa76955504933a22de6a33d2ca3dc0425
| * \ Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2017-08-070-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfc834197c -s ours am: 27d76ee0e9 -s ours Change-Id: Iab2259d5a2d1c3e4b8128ee5a7ea158bfeca5845
| | * \ Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2017-08-070-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: cfc834197c -s ours Change-Id: I86c93c0efd140be0629ef37a799a284d0f22b629
| | | * \ Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-0727-64/+64
| | | |\ \
| | | | * | Import translations. DO NOT MERGEBill Yi2017-08-0627-64/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c096a8d2547723cb86d2b4eeeb1ae23af27abff Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2017-08-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa5e02acca -s ours am: 516d3c38bf -s ours am: a5fc1aae20 -s ours Change-Id: I8e15f8b0227ba6b356454d1978550d78320c98d0
| * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2017-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa5e02acca -s ours am: 516d3c38bf -s ours Change-Id: Iedb86493d4620156646ebc71435cdb8323503231
| | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2017-08-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: aa5e02acca -s ours Change-Id: Iaeb1020ba5420fc0abeac2e680c04f1a7b503a15
| | | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-071-2/+2
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGEBill Yi2017-08-061-2/+2
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1eca86b7e2669a50f3f63eace03aa6eae1ea7e75 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2017-08-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fdeef487f -s ours am: 926f064dab -s ours am: 4f32faa3bf -s ours Change-Id: I71a90c42e09484013842bbe579a117db32823826
| * | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2017-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fdeef487f -s ours am: 926f064dab -s ours Change-Id: I9d826722dfc6db38f202493f4d7ec9ca5bddb47b
| | * | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2017-08-070-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3fdeef487f -s ours Change-Id: I9b9d6c0eb0c4feeff169ad05c3f956870b828218
| | | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-071-1/+1
| | | |\ \ \
| | | | * | | Import translations. DO NOT MERGEBill Yi2017-08-061-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I308e6ef94dbffe4df11934adff18eaee5101e42b Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ↵Bill Yi2017-08-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f30d524d80 -s ours am: c7ee513796 -s ours am: f58fd65285 -s ours Change-Id: I0ac5b0b2da31a099d22a5df1a4c32f4286a1f83a