| commit | 54ecee788012de0ba549aa4f55c7bd3c92913cac | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 12:32:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 12:32:47 2015 +0000 |
| tree | 2bf8c4a483035b2e6e2e004e607cea20c227ce33 | |
| parent | 49a34e6ccc28e0fff97568da436ee4b939954f62 [diff] | |
| parent | afd6b4ff91710d5baea1fee284bb295dfa24b3c2 [diff] |
am 3199b825: (-s ours) Import translations. DO NOT MERGE * commit '3199b8255c7106bce232b0be2df07818689672e5': Import translations. DO NOT MERGE