| commit | 6b960a9e04f25a5827fcc0e675b2de582f8aff84 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 29 14:29:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 14:29:19 2015 +0000 |
| tree | 80e1414002729ef947cc948611dcfd8f52c2317c | |
| parent | eb3d1a1bd7c6c51c8b2701768f27121a17a20b36 [diff] | |
| parent | e1b43ee91898b4c24a45cbdaa62b572068f998cf [diff] |
am e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'e1b43ee91898b4c24a45cbdaa62b572068f998cf': Import translations. DO NOT MERGE