commit | 8f9b34f69b21a1b69599709b95cc50a3d7dc4b7a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 15 15:44:20 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 15:44:20 2014 +0000 |
tree | 7cdc75352d962379cacc969303b930426ccd78ac | |
parent | 5d86c201f427b6c0e13e81683ed8192870d5ae0f [diff] | |
parent | 39d1497c877528361617c29eb7b57424f5cf39f1 [diff] |
am 9cf8056e: (-s ours) am a869e372: (-s ours) am cb5b0dd3: (-s ours) Import translations. DO NOT MERGE * commit '9cf8056e62fb390049e93ecb09ab874d84c39369': Import translations. DO NOT MERGE