commit | b1884ebe5d9c97608703065ec446250a874ef588 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:43:06 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:43:06 2015 +0000 |
tree | 19ab8bca32a31b13d1cd672de84982b6d85cb8d4 | |
parent | a3a59c79b837b7d42e2ac76df125a4bbeea2c8b7 [diff] | |
parent | 3a61d0f30ab549d99c4c5355fa72c842355d573e [diff] |
am 3a61d0f3: (-s ours) am bb3a3312: (-s ours) Import translations. DO NOT MERGE * commit '3a61d0f30ab549d99c4c5355fa72c842355d573e': Import translations. DO NOT MERGE