| commit | 3993100d2ac5848a2578984304291c21827a6b42 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:17:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:17:06 2015 +0000 |
| tree | 93442d6445b8d46bee3a13c86a884986e25e9b42 | |
| parent | baf8b88c8bf5849ec05bd11ce2cb1e09daf80e0f [diff] | |
| parent | 403fbe7f95d82470566b17f0da4106d0b613f6d0 [diff] |
am 403fbe7f: (-s ours) am cbdf356d: (-s ours) am ab064237: (-s ours) Import translations. DO NOT MERGE * commit '403fbe7f95d82470566b17f0da4106d0b613f6d0': Import translations. DO NOT MERGE