| commit | 8a1d95d8262e4e4616b6fe7df0937a05f047919f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 14:37:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 14:37:08 2014 +0000 |
| tree | b94980e67964795764371849b3f4e7acb9bf98d9 | |
| parent | 0ffb473e9d220455566378f17dffb7ac37e38fe1 [diff] | |
| parent | 3265974ff5573076afe26bac540ce5fabcf081b4 [diff] |
am 3265974f: (-s ours) am 93864659: (-s ours) Import translations. DO NOT MERGE * commit '3265974ff5573076afe26bac540ce5fabcf081b4': Import translations. DO NOT MERGE