| commit | 0f87e8d03e0355cab82cd57de1c0c614ca14d5ed | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:26 2015 +0000 |
| tree | 5790008aa949ab3f982a6b6f114152e972156e6b | |
| parent | 340d48e12f01c0617637f72fe0aedfff2f321b1e [diff] | |
| parent | 989b0d68554cad96d6c9cde0aa1e1bc625573eb8 [diff] |
am 989b0d68: (-s ours) am 25a64ced: (-s ours) Import translations. DO NOT MERGE * commit '989b0d68554cad96d6c9cde0aa1e1bc625573eb8': Import translations. DO NOT MERGE