| commit | 269e9ab8a1da9975b83182675ce1dee029e1aa5a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 03 18:46:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 18:46:43 2015 +0000 |
| tree | 55e54ac57653380e5e1c64696a1bb99e2adff507 | |
| parent | 58f49a20bf975d65286fef42fa29db7e0bc1c9a6 [diff] | |
| parent | fa5151e7fec9fe80a9c0dad96c3069430cf015a8 [diff] |
am fa5151e7: (-s ours) am a39fd457: (-s ours) Import translations. DO NOT MERGE * commit 'fa5151e7fec9fe80a9c0dad96c3069430cf015a8': Import translations. DO NOT MERGE