| commit | 67e374ce95752c5f4b7bb2d4cdbb52714989445a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 15:26:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 15:26:36 2015 +0000 |
| tree | a028839a77c3c5e4504dd86b1c6fa363c228d704 | |
| parent | 1f565ecce81db4c57535fd478c992c324bd67260 [diff] | |
| parent | 24c86652bae3c0b823bdc97ec1d1f949bbe1d1f3 [diff] |
am 24c86652: (-s ours) am 28aa0bfb: (-s ours) Import translations. DO NOT MERGE * commit '24c86652bae3c0b823bdc97ec1d1f949bbe1d1f3': Import translations. DO NOT MERGE