aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-10-205-8/+8
|\
| * Import translations. DO NOT MERGEBill Yi2017-10-205-8/+8
| | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: Ic7198eb249a6745a8e4a1c4517ce6f2805950383
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-10-202-2/+2
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-10-202-2/+2
| |/ | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: I3ac35f1a243185d7c10eafc64428927dbc95ebe3
* | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-10-2013-697/+409
|\ \
| * | Import translations. DO NOT MERGEBill Yi2017-10-2013-697/+409
| |/ | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: Iaabf04eb63eb41d2e895cdc011a540bf48de95ee
* / Import translations. DO NOT MERGEBill Yi2017-10-204-7/+7
|/ | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 68003463 Change-Id: I0b9604ade68baf6adc5a0ce7aaf9351aaeead8ec
* Merge "Remove LOCAL_CLANG"Lennart Wieboldt2017-09-115-9/+0
|\ | | | | | | | | | | am: ad5da5881d Change-Id: I161ea6bfe61fb7c8de7cb7dcbbf9aeae84cbca09
| * Merge "Remove LOCAL_CLANG"Treehugger Robot2017-09-115-9/+0
| |\
| | * Remove LOCAL_CLANGLennart Wieboldt2017-09-115-9/+0
| |/ | | | | | | | | | | | | clang is the default compiler since Android nougat Change-Id: I52d7f1ded227b21cd88d2d292f0af4adecb800f4 Signed-off-by: Lennart Wieboldt <lennart.1997@gmx.de>
* | 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 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 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 Change-Id: I6cd0be329d2ec06d4d38781997579989c9545562
| * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2017-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: f30d524d80 -s ours Change-Id: I58c300deb1d7e316b4c422935d71692b0db00b13
| | * | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-0713-22/+22
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2017-08-0613-22/+22
| | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Idfea205cf778dcf8ca4a0e7794fb4b9632441c1f 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86b1443231 -s ours am: 6c51cef57a -s ours Change-Id: I612ff4a199f8f22ac7d19af5592bad9c764cd2c1
| * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2017-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 86b1443231 -s ours Change-Id: Ic27567462e77c73a328a00172dc23e167dff5bd1
| | * | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2017-08-078-9/+9
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2017-08-068-9/+9
| | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Iedf4ea3ed578b904fa9cc269909dab7ff7d26af1 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | Import translations. DO NOT MERGE am: 15be9b5aff -s oursBill Yi2017-08-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: e9a7d341e3 -s ours Change-Id: Id0691d54b5b73c2ed4459a11c5241c33232154ef
| * | | Import translations. DO NOT MERGEBill Yi2017-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | am: 15be9b5aff -s ours Change-Id: I9a82928f7f1364ab642341e8827fca5df3951a04
| | * | Import translations. DO NOT MERGEBill Yi2017-08-061-1/+1
| | |/ | | | | | | | | | | | | | | | Change-Id: I27db96d1703710e6a8417a3020cc4039979c6086 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | Merge "Import translations. DO NOT MERGE" into oc-dr1-devBill Yi2017-08-050-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | am: e5580385b1 -s ours Change-Id: If0e4813d007f5b5d9a8817b899c9c112464c4b45
| * \ \ Merge "Import translations. DO NOT MERGE" into oc-dr1-devTreeHugger Robot2017-08-051-1/+1
| |\ \ \
| | * | | Import translations. DO NOT MERGEBill Yi2017-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib837b11a00db2397e55a6258b4ce69bbd7d93442 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into oc-dr1-devBill Yi2017-08-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4e6a16562f -s ours Change-Id: I384541fe2899c577f976de58b21f43519ed66075
| * | | | Merge "Import translations. DO NOT MERGE" into oc-dr1-devTreeHugger Robot2017-08-052-2/+2
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBill Yi2017-08-052-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33047c58713582da7ed206b22faa4ff11024cf9d Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into oc-dr1-devBill Yi2017-08-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1c5760eeae -s ours Change-Id: I83142fed8969dcec8f81fac7380ea79b7044f0fa
| * | | | Merge "Import translations. DO NOT MERGE" into oc-dr1-devTreeHugger Robot2017-08-051-1/+1
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBill Yi2017-08-051-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c77cd10984dd07fe76ae62b4839b801b1aa7650 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | | Import translations. DO NOT MERGEBill Yi2017-08-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: aee9e596da -s ours Change-Id: I359f1bc3dd4daf38f24efec5c1083dbdc338c666
| * | | | Import translations. DO NOT MERGEBill Yi2017-08-055-8/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0b774fdb8cbc8507e6534c13b3d64db79031dea Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
* | | | Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 ↵Bill Yi2017-07-270-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | -s ours am: 9467382a44 -s ours am: 2e2dfc94fc -s ours Change-Id: I7cec44bded9fcfe5267265a95986a228c6af6fd7
| * | | Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 ↵Bill Yi2017-07-270-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 9467382a44 -s ours Change-Id: I79e5a199e94ac635f0b8b8b6eaea3d3b4c98457f
* | \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 ↵Bill Yi2017-07-270-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 9467382a44 -s ours am: 4a6a014605 -s ours Change-Id: I7b16e3b03f740fc5004331e0f4de2ecdc8817c51
| * | | | Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 ↵Bill Yi2017-07-270-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 9467382a44 -s ours Change-Id: I33d15a705ef8eabba215efb59a4b583111b34265
| | * | | Merge "Import translations. DO NOT MERGE" into nyc-mr2-devBill Yi2017-07-260-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 01422e1ff5 -s ours Change-Id: I7745987e0e30d8bde20015409da01213fc8903d8
| | | * \ \ Merge "Import translations. DO NOT MERGE" into nyc-mr2-devTreeHugger Robot2017-07-263-5/+5
| | | |\ \ \