commit | 6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 29 20:56:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 20:56:00 2014 +0000 |
tree | 6303d6224cef025c3bf27cd800e2578e3d968002 | |
parent | 062afd5964003e482ce6dfd2b2443413f594ee4e [diff] | |
parent | 4c79a9ecc0124d85e66aa3041c6b65b8582f4c87 [diff] |
am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE * commit '4c79a9ecc0124d85e66aa3041c6b65b8582f4c87': Import translations. DO NOT MERGE