commit | bb744789fb648a1c6ff531d9911a16408032a335 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:49 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:49 2015 +0000 |
tree | 5786f3eaf156761d27779e4c4f5bbe6e1e4e4a7d | |
parent | c1c71e3933e9d082f2310737f1e3c8504f49536b [diff] | |
parent | 6553dd6e7cf2a95b2c3cb7f6e1c322a14bdcd86e [diff] |
am 6553dd6e: (-s ours) am b9e4739a: (-s ours) Import translations. DO NOT MERGE * commit '6553dd6e7cf2a95b2c3cb7f6e1c322a14bdcd86e': Import translations. DO NOT MERGE