commit | 86f6d4cc2351fad120b11bf543047df9b9fa3771 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 13 14:16:14 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 14:16:14 2014 +0000 |
tree | 1896fb35993cc028e811e754083a033726fab1c3 | |
parent | 103817ed366fbb604a3ab078ad0a1a28f615a21a [diff] | |
parent | a74a58865173f28416169adbfec92bc8573a4e89 [diff] |
am a74a5886: (-s ours) am a362bacb: (-s ours) am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE * commit 'a74a58865173f28416169adbfec92bc8573a4e89': Import translations. DO NOT MERGE