| commit | 1bd19dd17e2038df6c374ca6ed48498de4dde730 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 13:04:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 13:04:48 2015 +0000 |
| tree | 9297f01401c0867e937a42f49aaf2f4968d1d32f | |
| parent | f598d0bcf70e27a14462bc5403c83822c5600945 [diff] | |
| parent | 0e3ffe7cce1ceeac9eeac839d41db40ba983f97d [diff] |
am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE * commit '0e3ffe7cce1ceeac9eeac839d41db40ba983f97d': Import translations. DO NOT MERGE