| commit | 0cefb82c3bfa00697cd7fe154e3a99f1fe28cce2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 17:45:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 17:45:21 2014 +0000 |
| tree | b7489e833831cb1e58197fbf18898ae4d9d92db9 | |
| parent | 62827c260fecde800a88808485258ade386db9b4 [diff] | |
| parent | 2e4d8e1daa4273caa5c1c8da08d71663a5b79852 [diff] |
am 2a66ef61: (-s ours) am 6cdc9bd5: (-s ours) am 22e3bdce: (-s ours) Import translations. DO NOT MERGE * commit '2a66ef612c27a331c3b19ff07cfc649c14c7b457': Import translations. DO NOT MERGE