| commit | f4a48b946f7d188141184585cb7a1d6926205107 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 21:18:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:18:15 2015 +0000 |
| tree | 2eef63ba497d1eca5ecb7f026eba42a98093bede | |
| parent | 045eab545c26c8a8f6dc076ee8002919e7b22892 [diff] | |
| parent | 7176ebe97edcd6085400156fead4291a6f9fc3d7 [diff] |
am 57239de5: (-s ours) am ecd81b73: (-s ours) am b8eb8f86: (-s ours) Import translations. DO NOT MERGE * commit '57239de5502e9c145fb869c2ac43f55826e4dc20':