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