| commit | 4c14fc36da145809f08cecfbcf5caade5c985ad3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed May 13 15:27:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 13 15:27:51 2015 +0000 |
| tree | 571418d483885ce57f81a199b112dff8e25c90cb | |
| parent | 59c1622442c7bba1bb462a60ab6154559dcb5bf2 [diff] | |
| parent | b8cd5c09c30f4433715f0d943d9ce4c06eff413b [diff] |
am a262d56e: (-s ours) am 0dff9ba2: (-s ours) Import translations. DO NOT MERGE * commit 'a262d56ece4bd55e720bf03766e244961dee96a5': Import translations. DO NOT MERGE