| commit | f2f9d7e0c65c2367289e33c5a7acdcbf57841342 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:04:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:04:47 2015 +0000 |
| tree | fa31eb3b80386d52c9bd642232c969c1a80180de | |
| parent | ad9001f76fcbd9e6c4af8ae90329036ee51f0f50 [diff] | |
| parent | 2454134b4ba831d2bf007764411f449f19c1a998 [diff] |
am 62dc07dd: (-s ours) am 298289c8: (-s ours) Import translations. DO NOT MERGE * commit '62dc07dd5b4071724ab97ee04d9aa00c52cd0746': Import translations. DO NOT MERGE