commit | 5293d24747369bd1ec7ae49818b62d26ae22878c | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 14 13:34:37 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 13:34:37 2015 +0000 |
tree | 648b11b4b417f53bc51024c359e52b8f2584c583 | |
parent | 9a52008bb60d9af9023563ffae076cc5eaf587c4 [diff] | |
parent | c4549ebd380e95374acde8c5b8c37f0f5e756c1a [diff] |
am c4549ebd: (-s ours) am cfec547a: (-s ours) am dbad1a72: (-s ours) am 341e4d23: (-s ours) Import translations. DO NOT MERGE * commit 'c4549ebd380e95374acde8c5b8c37f0f5e756c1a': Import translations. DO NOT MERGE