| commit | 136ed7b6b2cae5ae02859330296087c734e2b70f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 13 03:59:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 03:59:58 2015 +0000 |
| tree | a50cd57c33ee37fb56ac95b6ee6c395368d3a781 | |
| parent | 1ab714057e7177f331f46aa72370eaf234e6dccb [diff] | |
| parent | 878faf03bc2ff22faf201c2e14b97ac47f95f977 [diff] |
am 878faf03: (-s ours) am 56b7a690: (-s ours) am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE * commit '878faf03bc2ff22faf201c2e14b97ac47f95f977': Import translations. DO NOT MERGE