commit | 5073cf5dbf2c754baa2b77ba741e0ea5babfd23e | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 05 13:13:40 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 05 13:13:40 2015 +0000 |
tree | d3995dd00245a4e3ac13e31c3199e5d0a7a86b59 | |
parent | 404d21fa17f250f3d1df04726a2e6be71d9a3f35 [diff] | |
parent | 223b9739a9debdbdfd2a4d3b42c66c36d04d21cd [diff] |
am 223b9739: (-s ours) am 37166a4c: (-s ours) am a4cd63f6: (-s ours) am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE * commit '223b9739a9debdbdfd2a4d3b42c66c36d04d21cd': Import translations. DO NOT MERGE