| commit | b8cd5c09c30f4433715f0d943d9ce4c06eff413b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed May 13 15:12:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 13 15:12:23 2015 +0000 |
| tree | 571418d483885ce57f81a199b112dff8e25c90cb | |
| parent | 0318ce373254f6a5b013f8df2e3afc796953f144 [diff] | |
| parent | 7148459b206294570f79886c8e304f596f2171d9 [diff] |
am 0dff9ba2: (-s ours) Import translations. DO NOT MERGE * commit '0dff9ba2337cdf165fe115ad4f3d6118d71665b0': Import translations. DO NOT MERGE