commit | 469ee0f81204def341d404aa64ff90cae6694924 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu May 21 18:43:18 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 21 18:43:18 2015 +0000 |
tree | 6d0cdeddb0ed5d9f80370d6dffc4bc1ae134acd5 | |
parent | 189a33235e4a63fc0a6f28015f6bff4e0160bafd [diff] | |
parent | a2c72297387fc9e67351c98db1f514d76e3ee25f [diff] |
am a2c72297: (-s ours) am a00612c4: (-s ours) Import translations. DO NOT MERGE * commit 'a2c72297387fc9e67351c98db1f514d76e3ee25f': Import translations. DO NOT MERGE