| commit | 0ffd61f8bb561174d2177843adf872cb56e55f2f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 22 21:08:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 21:08:18 2014 +0000 |
| tree | 5892af440bfb75a2d59ee28c873710f8df33281c | |
| parent | e6552972e7f6a2f021634d80f26aeb3b8e920472 [diff] | |
| parent | 7991c7d5fff06e0e53542806859a4a88ae03cfda [diff] |
am 5530019a: (-s ours) am 14558de5: (-s ours) Import translations. DO NOT MERGE * commit '5530019ac75e4ae72e3de5a3a510cba5a5165b74': Import translations. DO NOT MERGE