aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f56bd72ea7daddb7dbee42cf33bff77aea65d81 Auto-generated-cl: translation import
* | | | | | | | | Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: dbfd3a837e ↵Baligh Uddin2016-06-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 2e07e8a9dd -s ours am: f3e176a5df -s ours Change-Id: Ibd7c4501e76a3a2f7191352ac3ed6f1290edc3e2
| * | | | | | | | Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: dbfd3a837e ↵Baligh Uddin2016-06-080-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 2e07e8a9dd -s ours Change-Id: I1ae5f291b3abd72eff7155007c442ccd6b64bb2d
| | * | | | | | | Merge \"Import translations. DO NOT MERGE\" into nyc-devBaligh Uddin2016-06-080-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dbfd3a837e -s ours Change-Id: I42f666adec4ad973f5a66aee72b83b5ef7886f78
* | | | | | | | | Import translations. DO NOT MERGE am: 5c8db18dd1 -s ours am: cc0c57d21b -s ↵Baligh Uddin2016-06-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 8819f80ded -s ours Change-Id: Ib5259343912ff941893e72d413df4f29934b742a
| * | | | | | | | Import translations. DO NOT MERGE am: 5c8db18dd1 -s oursBaligh Uddin2016-06-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cc0c57d21b -s ours Change-Id: Idbdb884a337c2671dbf3c85a3564d1cb184a7f2e
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-06-080-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5c8db18dd1 -s ours Change-Id: Ib10b31bb2d5c639027f9836811f8867de361aeee
* | | | | | | | | | Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: dbfd3a837e ↵Baligh Uddin2016-06-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 2330bda48b -s ours am: 9d5b5ad34e -s ours Change-Id: I11a45045f1ed1c4519fc10232e693a4203eb53a9
| * | | | | | | | | Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: dbfd3a837e ↵Baligh Uddin2016-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 2330bda48b -s ours Change-Id: I5894a3e637e0150df1117ab1959154afe58c024c
| | * | | | | | | | Merge \"Import translations. DO NOT MERGE\" into nyc-devBaligh Uddin2016-06-080-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dbfd3a837e -s ours Change-Id: Ica49d61f60c86b0df9c7e1ad0a55b3d09e6ca7e5
| | | * | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-06-081-2/+2
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29169863 Change-Id: I15d8ac243062446fe14870a034e27d29dc0f7a6f
* | | | | | | | | | Import translations. DO NOT MERGE am: 5c8db18dd1 -s ours am: bed7b147cf -s ↵Baligh Uddin2016-06-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 43fcd45248 -s ours Change-Id: I2ba82697ca92104052beda5dc6aa962c7d6b6c17
| * | | | | | | | | Import translations. DO NOT MERGE am: 5c8db18dd1 -s oursBaligh Uddin2016-06-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bed7b147cf -s ours Change-Id: I15ed6848b02cff3b97f0792917724a91d43d49cc
| | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-06-080-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5c8db18dd1 -s ours Change-Id: I489a86c2712fe9e484a30c23a0d1cb99812569e7
| | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-06-071-2/+2
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29169863 Change-Id: If935daca902ebe248116fc37921c8c0055927336
* | | | | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2016-06-074-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-064-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81a1b3c22df68485b95c59e5d3ddf5b41dbf98fa Auto-generated-cl: translation import
* | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-0622-67/+67
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I506c97accf11f9485aa25d8ee6619cdce7f6e097 Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 59d2257e83 ↵Bill Yi2016-06-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 24f910f68a -s ours * commit '24f910f68ac2bd86d644eae79b3f8dfc333c5804': Import translations. DO NOT MERGE Change-Id: I8522a8df167904441ad122554848101104370f4e
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-06-050-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 59d2257e83 -s ours * commit '59d2257e83d24fa2fe49a3ecd202e29091f71e59': Import translations. DO NOT MERGE Change-Id: Ia85e0db607f291052dd3e9708de818cdd3d14d08
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-06-0577-1291/+753
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-0377-1291/+753
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie341cf89a71387d703b8449ae08174dc5af9db85 Auto-generated-cl: translation import
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e1b0fe7600 ↵Bill Yi2016-06-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: eacea0d64f -s ours * commit 'eacea0d64f3ecb8a79bd90d1bf1093c327991a76': Import translations. DO NOT MERGE Change-Id: Ie3fbd8ed5bd9fb35a3d86e6e5ab9fcb1189bbfc1
| * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-06-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e1b0fe7600 -s ours * commit 'e1b0fe7600f64feeacf94851379eefd5c78ffc3e': Import translations. DO NOT MERGE Change-Id: Ie1e07bfcf50990c7511102f72eaa8520f530e66f
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-06-051-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-031-1/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7d7963998d181c5d6f0284e4a79ba94ad7321e6 Auto-generated-cl: translation import
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 33793c58fa -s ↵Bill Yi2016-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b8d309d8c4 -s ours am: d689c15622 -s ours * commit 'd689c156226fceeada60986ab3fd291853cc7e1c': Change-Id: I9d3f0e2fe0df0248be5b5e511867c3f5b70cb497
| * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 33793c58fa -s oursBill Yi2016-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b8d309d8c4 -s ours * commit 'b8d309d8c4cfb8648c1e9e62102248a4dd83007e': Change-Id: I14c84553ba58bc948e1f11d81f3dcdca03ab1b89
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-06-030-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33793c58fa -s ours * commit '33793c58fae2660cd4270bc0644c4431c50d2b69': Import translations. DO NOT MERGE Change-Id: I7faf31b361d1444424f976c206fb09b08fdee324
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb204b98d5 -s ↵Bill Yi2016-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4d875b8b49 -s ours am: fb0e8ead91 -s ours * commit 'fb0e8ead919f3aafddb78ae8a8c45b821b92fd24': Change-Id: I616804d491f9bd8595248eb5574ce14e8ea7e8bb
| * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb204b98d5 -s oursBill Yi2016-06-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4d875b8b49 -s ours * commit '4d875b8b4907726b6d34e11d666298d7f19e34ac': Change-Id: I0ff850ee3f5d361601ab08a98bb14c377fb64b38
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-06-030-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cb204b98d5 -s ours * commit 'cb204b98d56bd25cd336fe7b3715bbb019c821af': Import translations. DO NOT MERGE Change-Id: I11964b2a7788bbcc85a5c5b8d3e84acd77a8116d
* | | | | | | | | | | Import translations. DO NOT MERGE am: c577c5919b -s ours am: b1aa8909d0 -s ↵Bill Yi2016-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b9bac86284 -s ours * commit 'b9bac86284929f83e06a17bc25652188791ba1b0': Change-Id: I590261835391d05c0f0ddbde88db0015c93c8342
| * | | | | | | | | | Import translations. DO NOT MERGE am: c577c5919b -s oursBill Yi2016-06-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b1aa8909d0 -s ours * commit 'b1aa8909d0e22800194881a2d18b9da5145fd1a2': Change-Id: I0cb1f601cd163e4b0f955897a347770975efbf3c
| | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-030-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c577c5919b -s ours * commit 'c577c5919b44e5fe410979e49573d642c76ed17d': Import translations. DO NOT MERGE Change-Id: I7fba3a49be60057c0a30898adbd0b55be928ca33
* | | | | | | | | | | | Import translations. DO NOT MERGE am: 9234d88740 -s ours am: e75020ebb4 -s ↵Bill Yi2016-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 055203fb0f -s ours * commit '055203fb0f88eb6f8b80ee43bcad8d49dd590d7c': Change-Id: I1be8e66437632bc5927868449ff016cd4b52a23f
| * | | | | | | | | | | Import translations. DO NOT MERGE am: 9234d88740 -s oursBill Yi2016-06-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e75020ebb4 -s ours * commit 'e75020ebb4d44d6c3b4e61a9ee555d707e0ede62': Change-Id: I11323df638ffc806163c179ea25da5ba76c0ad7a
| | * | | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9234d88740 -s ours * commit '9234d887408e14e5d9ebae64da740f99185092e3': Import translations. DO NOT MERGE Change-Id: Ic1835ebe83d8d2dc9fb07aee219657a7912bb157
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 33793c58fa -s ↵Bill Yi2016-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 8c6f5d0764 -s ours am: 589fe61dad -s ours * commit '589fe61dad8e5e4c53a4761de82bbcc6cf2bed96': Import translations. DO NOT MERGE Change-Id: I5c4650d98555c61e20c030295eb46d8cd6da5a5a
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 33793c58fa -s oursBill Yi2016-06-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8c6f5d0764 -s ours * commit '8c6f5d07648d8cb72be6e0e1d6fe35188ca9b81b': Import translations. DO NOT MERGE Change-Id: I368891126a061585e8429218dc2ef873f9b8c9af
| | * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-06-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33793c58fa -s ours * commit '33793c58fae2660cd4270bc0644c4431c50d2b69': Import translations. DO NOT MERGE Change-Id: I8632b02759cdfaa0536053ee23302109d650c452
| | | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devTreeHugger Robot2016-06-032-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-032-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b67a347d3955764ff2ec6fa124629c13393fb28 Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb204b98d5 -s ↵Bill Yi2016-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b4485e55f6 -s ours am: 386301a7ed -s ours * commit '386301a7ed5e37f3ab44b10cfd6530ee686c344e': Import translations. DO NOT MERGE Change-Id: I748e3f9a55c88d037bd8350325290ee8a304ffb7
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb204b98d5 -s oursBill Yi2016-06-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b4485e55f6 -s ours * commit 'b4485e55f69800d8411dd89947be36ac9bdff4fd': Import translations. DO NOT MERGE Change-Id: I52581e91b35c99e0f626d4099f51c7a649c2911c
| | * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBill Yi2016-06-030-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cb204b98d5 -s ours * commit 'cb204b98d56bd25cd336fe7b3715bbb019c821af': Import translations. DO NOT MERGE Change-Id: Ief5487eae91a182dc77ce0c6a0413f7e754ea1b6
| | | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devTreeHugger Robot2016-06-031-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Import translations. DO NOT MERGEBill Yi2016-06-031-1/+1
| | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If62eba81dd658dbd1c83d5ec2b13453bb84e6903 Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: c577c5919b -s ↵Bill Yi2016-06-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: c7cff38ef9 -s ours am: 9c834d4573 -s ours * commit '9c834d4573d913af6ff1f0ca6321ba18f8bab057': Import translations. DO NOT MERGE Change-Id: I2f97bb571cad2ae85ed9726bb06aade432412965