| commit | 3848213db697be0974e8c6de7fe08e4fb6e3fc84 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 20:14:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 20:14:53 2014 +0000 |
| tree | 3f625575b6c4a762852f88c1524a9b94bfec5ee1 | |
| parent | c9943086044f6be109cb3cfd8543c599e1f3eca5 [diff] | |
| parent | 08dcb051b17c29578c2f9b9c5267476c57b5c646 [diff] |
am 08dcb051: (-s ours) am 38187407: (-s ours) am 1f52dcb1: (-s ours) Import translations. DO NOT MERGE * commit '08dcb051b17c29578c2f9b9c5267476c57b5c646': Import translations. DO NOT MERGE