| commit | dd73b9935d76d33a339bc703c232209b976f4acf | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:08:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:55 2014 +0000 |
| tree | 15f1f09a74eac467a820a8304b55537feebc692a | |
| parent | dd2417d5f8c2099361c36bcc645709a0e8a76fd5 [diff] | |
| parent | 348ef1abe41d9b3f20c32a884ba0906378743b82 [diff] |
am 200a0614: (-s ours) am fdeb4feb: (-s ours) Import translations. DO NOT MERGE * commit '200a0614d936e34e68deb5a509abe1c9e1f934f0': Import translations. DO NOT MERGE