commit | 8dd592c4ed32c3869a36d0ad07097936b58b3de1 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Mar 17 23:34:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 23:34:34 2014 +0000 |
tree | 67b8684b10296ba0b8f2024687982e9bc74b3cb3 | |
parent | b5301cc0de900b5fdd67860a2274bfada5d6c17a [diff] | |
parent | 8842ed6816d818f065c8ffa475daf78ab44633f6 [diff] |
am 4c0c18d0: (-s ours) am 1aa9baea: (-s ours) Import translations. DO NOT MERGE * commit '4c0c18d06b38fd42f6299e35040ee130f25535fc': Import translations. DO NOT MERGE