| commit | 18b5e4f17fc6fb729d2c1828c9bcdef2172ff1da | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 19:41:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 19:41:12 2015 +0000 |
| tree | a9c17784b4a2c12714b3c46d36e3bf50890ce6de | |
| parent | 992393481ba7e7af6cc4c626e1c660ed869148cd [diff] | |
| parent | ffab862f25dffe3c9c9d688cc1eb9b936db10734 [diff] |
am ffab862f: (-s ours) am 614e584a: (-s ours) Import translations. DO NOT MERGE * commit 'ffab862f25dffe3c9c9d688cc1eb9b936db10734': Import translations. DO NOT MERGE