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