| commit | 222dead36e3ca93b3e4d79fcd6c10cc7d5115184 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:39:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:39:46 2015 +0000 |
| tree | 708379586543f17a6cd770281c19e445be44fa4a | |
| parent | bb43771d7891465cc58392e2e5bc90f133e7bca8 [diff] | |
| parent | dd4dc51a25d97d45e661dcb8d245a816413ec9e5 [diff] |
am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'dd4dc51a25d97d45e661dcb8d245a816413ec9e5': Import translations. DO NOT MERGE