commit | ad1d38e0a7cf2ace2b95dee1c55a4f2e29dd6d7c | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Dec 17 14:31:16 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 14:31:16 2014 +0000 |
tree | ceaf58ae16c49df859080273e33b4bf7e0c7932a | |
parent | 3265974ff5573076afe26bac540ce5fabcf081b4 [diff] | |
parent | 4ee8ff7c4b2df9aebe0877866fd8b4326f9b5dc0 [diff] |
am 4ee8ff7c: (-s ours) am d32a8618: (-s ours) Import translations. DO NOT MERGE * commit '4ee8ff7c4b2df9aebe0877866fd8b4326f9b5dc0': Import translations. DO NOT MERGE