commit | 926d0c4138e09ef70a9e547be4e360962d839733 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Nov 25 10:41:21 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 25 10:41:21 2013 -0800 |
tree | c4c4272257bccc638840822eb4b6bcdbac699e19 | |
parent | 713e3853bf57410f389496c20db1fc3818b3d5d8 [diff] | |
parent | 3b6fa618ce8a1f14bb3949ce8c7be3417fb8568a [diff] |
am 3b6fa618: (-s ours) am 7a4adedf: (-s ours) Import translations. DO NOT MERGE * commit '3b6fa618ce8a1f14bb3949ce8c7be3417fb8568a': Import translations. DO NOT MERGE