commit | 6433d6dfa336ff908b19f63055c7e53d80fbb6b1 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu May 14 06:38:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 06:38:57 2015 +0000 |
tree | de84ff18d9967c9db2d5252968d86a9ba7857b5e | |
parent | 3f5977b5f478b1fc1af46984714cfd1e5f2f39e4 [diff] | |
parent | d274b3614ea32c8f0083ad43640335aae6e68348 [diff] |
am d274b361: (-s ours) am 393da3d2: (-s ours) Import translations. DO NOT MERGE * commit 'd274b3614ea32c8f0083ad43640335aae6e68348': Import translations. DO NOT MERGE