commit | f513ca2fa187ffdd099272b12df932f89be4824c | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Feb 11 19:20:15 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 19:20:15 2015 +0000 |
tree | 8e9330998c1bc1a4189e76c19427f5026e7f1365 | |
parent | 96a90af83bddfec535bc4ebe96545145d0b33285 [diff] | |
parent | d232a3fa5c86f19ccf559bf4dc649d39d3620ca3 [diff] |
am d232a3fa: (-s ours) am 60d2ee87: (-s ours) Import translations. DO NOT MERGE * commit 'd232a3fa5c86f19ccf559bf4dc649d39d3620ca3':