| commit | dc61eafd2d8dcd86c9c8e1c183d13816b01d5a67 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 05 17:39:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 05 17:39:16 2015 +0000 |
| tree | 2a1e799d66258669d0d18f321aeeadfdc53e9c21 | |
| parent | dfbc7053e0a5bdd6c3b0ddedd781e555f9f7a796 [diff] | |
| parent | 14688691760285253f42d8f0ebddee57a87af65f [diff] |
am 14688691: (-s ours) am 3074b5cd: (-s ours) am b126b820: (-s ours) Import translations. DO NOT MERGE * commit '14688691760285253f42d8f0ebddee57a87af65f': Import translations. DO NOT MERGE