commit | 429052d5836f36ee2b5385a168d07d67937e92d5 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Mar 04 13:44:17 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 13:44:17 2015 +0000 |
tree | e818f0ed320c0ce785a31bfe93e61fe0bf3f0394 | |
parent | b3e2fedb5f19dbff9185cb641c3edabb37a28526 [diff] | |
parent | d1c5ae486dc09d10dffaf138c98ad6daed182993 [diff] |
am d1c5ae48: (-s ours) am b4ee938f: (-s ours) Import translations. DO NOT MERGE * commit 'd1c5ae486dc09d10dffaf138c98ad6daed182993': Import translations. DO NOT MERGE