| commit | 9cc1143d8f7e7810b73516f0797558c09614c477 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 31 14:25:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 31 14:25:26 2015 +0000 |
| tree | 445e9c5a0a3d466d0297d5b9ee82dd17cb3afa04 | |
| parent | f7a20d5349288f5efb7c94c60d7459b335fb9f98 [diff] | |
| parent | 0e6d38462b96c61465d06ce6c5dfa17297e49df8 [diff] |
am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE * commit '0e6d38462b96c61465d06ce6c5dfa17297e49df8': Import translations. DO NOT MERGE