| commit | 3dcd25960a1d0170179c541c7c31cb27b0c4e956 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:42:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:42:46 2015 +0000 |
| tree | 20e0c89f8ff40124b3c26912009dc15e26758f3b | |
| parent | b4ea647c930f79b3dbc658e6b9309531ea90ab9c [diff] | |
| parent | eda69db7427804d177762e4c8d066c368b84a33a [diff] |
am eda69db7: (-s ours) am 1367ed0e: (-s ours) am 12c4b02b: (-s ours) am 818b47a9: (-s ours) am 4477e6d5: (-s ours) Import translations. DO NOT MERGE * commit 'eda69db7427804d177762e4c8d066c368b84a33a': Import translations. DO NOT MERGE