| commit | cb84797d86db4e386a477c3ac569c28aee10ddd0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 05 14:31:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 05 14:31:05 2015 +0000 |
| tree | 9d4804804a0b21e67513de966a2b2f85cdac5435 | |
| parent | c0b5d542b6f68dfcd0c90496d487986c9727da84 [diff] | |
| parent | 353c5b5010396152cdc8b9bb7f5717c0ac8a1296 [diff] |
am 353c5b50: (-s ours) am 7e669a0a: (-s ours) Import translations. DO NOT MERGE * commit '353c5b5010396152cdc8b9bb7f5717c0ac8a1296': Import translations. DO NOT MERGE