| commit | b9f4e4bd41667071186ab68c17e52681c70e1191 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 08 18:38:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 18:38:43 2015 +0000 |
| tree | 0642ecabd5267c772c3d1cf9b30e7c55eee608aa | |
| parent | 9ae2c4e7abe153dc15cc1c66c001bfe7ea2b38b3 [diff] | |
| parent | 5a593ae7979d5f2b7fe19b677382a4a26c782055 [diff] |
am 5a593ae7: (-s ours) am f58f6c6e: (-s ours) am 06202b5c: (-s ours) Import translations. DO NOT MERGE * commit '5a593ae7979d5f2b7fe19b677382a4a26c782055': Import translations. DO NOT MERGE