| commit | 98f5af661779164a4ff277d29c91831ef2938a88 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 21:59:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 21:59:53 2015 +0000 |
| tree | 37c07187be6361dda89745d484284525b79b9f61 | |
| parent | cf66f383688056ae6a9f9887b8ceecb9c4c8a20d [diff] | |
| parent | 7262e3ae08691c336b46ea3fd2e2bd23e47bef8e [diff] |
am 7262e3ae: (-s ours) am d2397fbc: (-s ours) Import translations. DO NOT MERGE * commit '7262e3ae08691c336b46ea3fd2e2bd23e47bef8e': Import translations. DO NOT MERGE