| commit | 8bc1a86ed31fbf005ce2ed89d3cd55be127d6c0a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 29 14:07:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 14:07:58 2015 +0000 |
| tree | 633be99ae0d1e2a473680161e3d0bc3faad778c4 | |
| parent | 99f5ad3f1276fcf8068e8e610c41d31a7b16f766 [diff] | |
| parent | d2731accd57fd8c6ac251788df5ca0536953264b [diff] |
am ff4ce8b3: (-s ours) am 9060c504: (-s ours) am a32f5507: (-s ours) Import translations. DO NOT MERGE * commit 'ff4ce8b3e6f7a425e0faa793c65aff5ecc6fff03': Import translations. DO NOT MERGE