| commit | 012208abf4f3343a73ce4b321542a7bae6577106 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 19 17:56:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 17:56:38 2014 +0000 |
| tree | e635ddc77d08e92fd0e1791ef7a706069c94aa49 | |
| parent | 58a7a79651b24caa62522a9ac8e946438bbf5645 [diff] | |
| parent | 7cca01aa1d5aa1c8b8f10117fd2d83a49c82bea5 [diff] |
am 7cca01aa: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '7cca01aa1d5aa1c8b8f10117fd2d83a49c82bea5': Import translations. DO NOT MERGE