commit | cd0e0e085bb4c7ca0863be91bec37d0bcc4c771f | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Sat Aug 01 17:05:32 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 17:05:32 2015 +0000 |
tree | def609223ebeaf5de86f7ad87fee0f4e84049de8 | |
parent | 3ef4a74cfce2fa62cb34d37e15d7a6bb520f9a61 [diff] | |
parent | 72bd8f4b4a41207637c6b54b93b21fb4a2de2065 [diff] |
am 72bd8f4b: (-s ours) am b6cc23ff: (-s ours) am ec5371e4: (-s ours) am 480c600d: (-s ours) am 97e3b5fc: (-s ours) Import translations. DO NOT MERGE * commit '72bd8f4b4a41207637c6b54b93b21fb4a2de2065': Import translations. DO NOT MERGE