| commit | 9f0b7264e55ca2ba96cd09df0c307c169c58b56d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 11 17:25:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 11 17:25:25 2015 +0000 |
| tree | 2c865b98b8cb52f3faa81f149b99f1467789d3d6 | |
| parent | 3335973a6710135a299a615c7a48555c51586e97 [diff] | |
| parent | feb731a2c94d2238587d1a84d0a2d09f99329612 [diff] |
am feb731a2: (-s ours) am dd07a862: (-s ours) Import translations. DO NOT MERGE * commit 'feb731a2c94d2238587d1a84d0a2d09f99329612': Import translations. DO NOT MERGE