| commit | 1c57f7c40105713e06799195fabbaa727f801cc3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 14:18:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:18:05 2015 +0000 |
| tree | 84230245b6d0620425180d5fab12ff558de999ab | |
| parent | b9db3fef03ceebea69fa22d6b5de96f56b669340 [diff] | |
| parent | f5e9a0e8d4140e3f1ad1f77806dc50109e591c79 [diff] |
am f5e9a0e8: (-s ours) am e0001664: (-s ours) am 2d37dbd0: (-s ours) Import translations. DO NOT MERGE * commit 'f5e9a0e8d4140e3f1ad1f77806dc50109e591c79':