| commit | 9ebc9463ece53c75e290a4ca378f46f19d087614 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:36 2015 +0000 |
| tree | 2da686b8ece2644cd8a7b0aa9de6364a8c8889d8 | |
| parent | e1343214088af4742438c92b0d96c4ba8bbf0e2d [diff] | |
| parent | 9942e6f277343f5a9cb26346b588c9a181ad3695 [diff] |
am 9942e6f2: (-s ours) am 3c46e939: (-s ours) Import translations. DO NOT MERGE * commit '9942e6f277343f5a9cb26346b588c9a181ad3695': Import translations. DO NOT MERGE