| commit | 56b7a690d1e4ca8bf50347b72f6dc2222d326db2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 19:42:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 19:42:31 2015 +0000 |
| tree | d2658caf61ec2cb001e7fd6ccb93297d9b4d563c | |
| parent | 93c6f4fc3a0459bad43efd02097c3f133cc0679b [diff] | |
| parent | 14bd3435f306d0ece1715c8bd32e843d0f836fdd [diff] |
am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE * commit '14bd3435f306d0ece1715c8bd32e843d0f836fdd': Import translations. DO NOT MERGE