commit | bbec724b2ae4677685a7300ae4b0c1e820cdf33a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:05:27 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:05:27 2015 +0000 |
tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
parent | c787bd666330f872e2f3aff0d3f590724f95d574 [diff] | |
parent | 043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5 [diff] |
am 043af557: (-s ours) am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE * commit '043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5':