| commit | e496e292096a57fa43bc193a8d797e8449ef9e71 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:15:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:15:58 2014 +0000 |
| tree | 1ee9143ae8c4aac9bab01abae01d1953e76e7240 | |
| parent | 6b5eba585e24db0fb14dac428efa01cd8633af43 [diff] | |
| parent | 712363889899bfff564a39ef4d88ff048a9e5ec7 [diff] |
am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '712363889899bfff564a39ef4d88ff048a9e5ec7': Import translations. DO NOT MERGE