| commit | a7429d23ae539bd8932271e37b4cd52e7d7ed248 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 21:54:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 21:54:46 2015 +0000 |
| tree | 47c57b3a3f5fff80c1c86a37359a71a5cc45703a | |
| parent | 1b1a1b6e77aa08c22cc1547fe45ab84963c97347 [diff] | |
| parent | f67c36432c23546b6005348075f0056c884d1b50 [diff] |
am f67c3643: (-s ours) am cd4919b8: (-s ours) Import translations. DO NOT MERGE * commit 'f67c36432c23546b6005348075f0056c884d1b50': Import translations. DO NOT MERGE