| commit | 7b0b167abaf314f07b8fdfa904a5812ec833e2d5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:13:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:13:51 2015 +0000 |
| tree | 49c740e5be69189abacef10749c4bf9b3ed99c94 | |
| parent | b581073066119f076e279702f0db9bc44b33f4dc [diff] | |
| parent | 3a71582526ea6157d29b3737aee38395f8639f8d [diff] |
am d9bf0079: (-s ours) am 1e365a3d: (-s ours) Import translations. DO NOT MERGE * commit 'd9bf00797d1398076181b71a19e98624b7d7c3dc': Import translations. DO NOT MERGE