| commit | 79c9053a254a43e65738686893829fb0f9006aaf | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Apr 25 09:38:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 25 09:38:58 2015 +0000 |
| tree | d794fcf157bdef94c41b97a572637b1fb7bc2645 | |
| parent | 6aa886bd89c1d6a3041b105641a571b786cba82a [diff] | |
| parent | e9b52401a25f0c6d1a4d8465bb840ea467f41ea4 [diff] |
am e9b52401: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'e9b52401a25f0c6d1a4d8465bb840ea467f41ea4': Import translations. DO NOT MERGE