| commit | 7176ebe97edcd6085400156fead4291a6f9fc3d7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:16:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:42 2015 +0000 |
| tree | a338fc515b7817f1306a79dd4886a8e851fe8deb | |
| parent | 726a3a6f874b8ffe7d1be8ae39b615ed0111307c [diff] | |
| parent | d36c592d2e2960c3a992e550e5bf597346b3771a [diff] |
am ecd81b73: (-s ours) am b8eb8f86: (-s ours) Import translations. DO NOT MERGE * commit 'ecd81b7393c947e7593fde6b21e9304b964dd41f':