| commit | ca02c1b8fc6002dadf0214a33462a9e3813ab7b4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:39:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:39:46 2014 +0000 |
| tree | 31ef12a6bd9ef36e143d1c9f30877fae03d71c79 | |
| parent | 161ed6c1c5e2e870bf5d0aa587b9db8e45492511 [diff] | |
| parent | bfca8281f590e2e7354709282f53846995662ea8 [diff] |
am bfca8281: (-s ours) am c12a3842: (-s ours) Import translations. DO NOT MERGE * commit 'bfca8281f590e2e7354709282f53846995662ea8': Import translations. DO NOT MERGE