| commit | 2d954c7b46b40033161f61bebfad213f97821a8d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 29 14:27:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 14:27:24 2015 +0000 |
| tree | 84527c174c7f49e0baf8ea58496ad0489c719a7f | |
| parent | 23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2 [diff] | |
| parent | eb3d1a1bd7c6c51c8b2701768f27121a17a20b36 [diff] |
am eb3d1a1b: (-s ours) am 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'eb3d1a1bd7c6c51c8b2701768f27121a17a20b36': Import translations. DO NOT MERGE