| commit | 1d1d42a2c145b940d86d8d3c7ef679055d72541d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:43 2015 +0000 |
| tree | f16027c118b17ff680750d876012b663b5b2fe2d | |
| parent | b5e9842f9b8224aebb0b10117c2507e618143045 [diff] | |
| parent | cf66f383688056ae6a9f9887b8ceecb9c4c8a20d [diff] |
am cf66f383: (-s ours) am fd4effa0: (-s ours) Import translations. DO NOT MERGE * commit 'cf66f383688056ae6a9f9887b8ceecb9c4c8a20d': Import translations. DO NOT MERGE