commit | 345b41cdc09e74cdeeb1f8308b8b8e2265fd0ec4 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 06 17:12:13 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 17:12:13 2015 +0000 |
tree | 5986bd6a362f6f4240635a3b4ffeb8df65145959 | |
parent | 9008d3b86dd9a91836a4f29ba422f80ab9f8e4a9 [diff] | |
parent | 06a23cb0f9fc29975391835b0bc7f90a112f1be4 [diff] |
am 06a23cb0: (-s ours) am a5636a98: (-s ours) am 16171454: (-s ours) am 78d41d21: (-s ours) am b72e493b: (-s ours) Import translations. DO NOT MERGE * commit '06a23cb0f9fc29975391835b0bc7f90a112f1be4': Import translations. DO NOT MERGE