commit | d2e0cb16e537e43e41c288034b5baa2177a9c2c8 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:45 2015 +0000 |
tree | 19ab8bca32a31b13d1cd672de84982b6d85cb8d4 | |
parent | d9d94b7d706cbb03b44b1cf72e8441ebea890f04 [diff] | |
parent | a3a59c79b837b7d42e2ac76df125a4bbeea2c8b7 [diff] |
am a3a59c79: (-s ours) am 382e35b8: (-s ours) Import translations. DO NOT MERGE * commit 'a3a59c79b837b7d42e2ac76df125a4bbeea2c8b7': Import translations. DO NOT MERGE