commit | a00494c0836ec2a5fa4ef0d801158af9800e1c7a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Oct 21 16:50:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 16:50:12 2014 +0000 |
tree | 43fdd1a67d3a0161fea7fdb56f89accf1a1effac | |
parent | 0f94ad43e1c1383f0e89a11e49b4c4e3619b7a8a [diff] | |
parent | 10f70599c6d98bcd05b86b9e70408d84faf5c05f [diff] |
am f2f4244c: (-s ours) am 0f661f4b: (-s ours) Import translations. DO NOT MERGE * commit 'f2f4244c08dc95c38269d4579fbd20ca67367ea3': Import translations. DO NOT MERGE