| commit | 9ad05de29eb0320d9e3c64da7c469822ecd984d9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 05 14:26:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 05 14:26:49 2015 +0000 |
| tree | 51c0c0c08aaee75bcb5f1388dbfc0bdcc8248520 | |
| parent | ea508588e9c4a9d87f36b0e74de4d9420c2af06d [diff] | |
| parent | 5c6fff5431aa83a4082f6203ac8cdd4122f3f9fb [diff] |
am 5c6fff54: (-s ours) am ad111b65: (-s ours) am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE * commit '5c6fff5431aa83a4082f6203ac8cdd4122f3f9fb': Import translations. DO NOT MERGE