aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-devBill Yi2016-07-210-0/+0
|\ | | | | | | | | | | am: d882cca4de -s ours Change-Id: I2dfbcd8e9b1da2f068e685119e97f6d4e13dabdd
| * Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot2016-07-213-12/+47
| |\
| | * Import translations. DO NOT MERGEBill Yi2016-07-203-12/+47
| | | | | | | | | | | | | | | Change-Id: Ibac449f0ef30e676c39757660b473ee71cf7c804 Auto-generated-cl: translation import
* | | Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-devBill Yi2016-07-210-0/+0
|\| | | | | | | | | | | | | | | | | am: 60ec912326 -s ours Change-Id: I7933d10917f0017fbb1d3f80a56eab35866398dc
| * | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot2016-07-212-0/+48
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2016-07-202-0/+48
| | |/ | | | | | | | | | | | | Change-Id: Ic7bcee440b44ec13c5d74cefe1c0d5ec1abc4a31 Auto-generated-cl: translation import
* | | Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-devBill Yi2016-07-210-0/+0
|\| | | | | | | | | | | | | | | | | am: 7b1931674d -s ours Change-Id: I8328c9cfb2376ca35d668e03e672e5eb537b09c8
| * | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot2016-07-213-1/+225
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2016-07-203-1/+225
| | |/ | | | | | | | | | | | | Change-Id: Iccd2d3da4e190da72de2f8220c881215ecd548a9 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBill Yi2016-07-210-0/+0
|\| | | | | | | | | | | | | | | | | am: d13373cd97 -s ours Change-Id: I21468b78256d880d3b2d809de75e44587fd0fa02
| * | Import translations. DO NOT MERGEBill Yi2016-07-204-6/+6
| |/ | | | | | | | | Change-Id: Ibdbd0f6cc3164d3744f2b197c611fc085ca27a09 Auto-generated-cl: translation import
* | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-300-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | 8181498163 -s ours am: 9b14186afe -s ours Change-Id: If6ba57a9d3afea7a6f76d0986988fbc9dbb70b6a
| * \ Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-300-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 8181498163 -s ours Change-Id: Ib6c69380847dd5bd89e62495c00abe78227d632d
| | * \ Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-06-3077-776/+777
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2016-06-3077-776/+777
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: Ib777b462a9e91772e41e93ab27516258b2a9e5da
* | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64e0910859 -s ours am: 32b5920734 -s ours Change-Id: I737ae370dfd0baf9454f21bc035e5ba5effe3786
| * | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 64e0910859 -s ours Change-Id: I056ff501980e58d5ace3fa6c3aa07c66d20bebe2
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-06-301-1/+1
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2016-06-301-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: I98cf6044cc5cc77549ae595a2b2d543a797da627
* | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 698db8cba9 -s ours am: f7c18ab52f -s ours Change-Id: I06ccad46bfffe67c2a2f4f284c2d4b0f3fd39f27
| * | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 698db8cba9 -s ours Change-Id: I84db558369ab5a4d1f0142b8c5101830f8bec472
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-06-307-11/+11
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2016-06-307-11/+11
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: I00e4356f390a9017bb2b569b90ad9f69d7e8ea5f
* | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7fe0be6a2 -s ours am: 38ef30bc81 -s ours Change-Id: Ia094cfde386dc269efc050cd41b143ef69ea3667
| * | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f7fe0be6a2 -s ours Change-Id: Iac6c9a980e0de2e0b4f3a9b10754a9e6a51c0dcb
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-06-301-2/+2
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2016-06-301-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: I7b096bdfa2cbea48f9474d04ab03f175720ed8db
* | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80eee73afb -s ours am: a461b81a54 -s ours Change-Id: I42c756fa6a969bae7570dfbdf2378c8ac9ea23db
| * | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 80eee73afb -s ours Change-Id: If413b62f4f36d0cf840190096dc935521b46b406
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-06-3012-29/+29
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2016-06-3012-29/+29
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: I1f8a50df1ce01540b627e24fd5c4995af9b4d582
* | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b10be9d131 -s ours am: a9bfdd4dd2 -s ours Change-Id: I5d6d7f623d6ed27bf0d132ebff335d3b136ea8e8
| * | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b10be9d131 -s ours Change-Id: I12b1529c1f983c047e4a1d633ae98a5d0054a65d
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterTreeHugger Robot2016-06-301-1/+1
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2016-06-301-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: Icedecf2e1ac22b02d29d11d93980499c90bc82ba
* | | | | Import translations. DO NOT MERGE am: 6da7ea4dfd -s oursBill Yi2016-06-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 20ac4e9923 -s ours Change-Id: Id8d4b47132f86b72a9c77048d47875720514164d
| * | | | Import translations. DO NOT MERGEBill Yi2016-06-300-0/+0
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | am: 6da7ea4dfd -s ours Change-Id: Ifd4cdb8d116f14161d1a32068582ac24123ad027
| | * | Import translations. DO NOT MERGEBill Yi2016-06-303-3/+3
| |/ / | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: I11c592e3a9bc4f47b7438f55b3c46968b0befe2f
* | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 2ebc49de87 -s ours am: 721e972633 -s ours Change-Id: Ia1d0f2fef183cc0f81902bbf5c5a229d5b6436b4
| * | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-170-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 2ebc49de87 -s ours Change-Id: I56a11d5e529d87205c1be5a18bd6af78e695ab6a
| | * \ Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-06-1777-775/+776
| | |\ \
| | | * | Import translations. DO NOT MERGEBill Yi2016-06-1677-775/+776
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: I61ad4698f55cd417436964c0c5f4b4da4f1bcd10
* | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b82b53b82 -s ours am: 66299ffce0 -s ours Change-Id: I889924b2d9eb24e0ce160cfae0d5dff99e51c60d
| * | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0b82b53b82 -s ours Change-Id: I6191fe0a0b48508149189c391f106d9783f8ffd2
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-06-1712-29/+29
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2016-06-1612-29/+29
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: I965f52a8667f9124f0c36fc5d64690711449beb3
* | | | | Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: ↵Bill Yi2016-06-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 464f60e489 -s ours am: ca24f0f89b -s ours Change-Id: I4d3b05f90c357c4a58ff6a861fbafd2783809a12
| * | | | Merge \"Import translations. DO NOT MERGE\" into stage-aosp-masterBill Yi2016-06-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 464f60e489 -s ours Change-Id: Ied3b03a39ae0ef882dbac8c8f7dcf62587056e1f
| | * | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterBill Yi2016-06-161-2/+2
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBill Yi2016-06-161-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29390361 Change-Id: I7de552e1348950d973dcc968c968b6fe0fe6ad35