| commit | 2bfe9845afb41c3270242a99dcbff9dbe5cc5e79 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:41:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:41:50 2015 +0000 |
| tree | 39d2101d15cf087e66f165063e5ae07c932e941f | |
| parent | 777bc69e8b64e9f7b63eb49d94fd23daff73c5c8 [diff] | |
| parent | db3ecf5488b7838078f951b236a6109e6c61ffba [diff] |
am db3ecf54: (-s ours) am d33a33f8: (-s ours) Import translations. DO NOT MERGE * commit 'db3ecf5488b7838078f951b236a6109e6c61ffba': Import translations. DO NOT MERGE