| commit | ec215e616e8c21e42d7bc014a21b4fa3d83067f6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 14:18:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:18:33 2015 +0000 |
| tree | 84230245b6d0620425180d5fab12ff558de999ab | |
| parent | c55bd3f0f8c11ddb6ed08dd7f753f09320318fb4 [diff] | |
| parent | c2089c4172fae3ec54aca2ee9bbf4a1919d5c9e5 [diff] |
am c2089c41: (-s ours) am dbb3ae89: (-s ours) am a8f551b5: (-s ours) Import translations. DO NOT MERGE * commit 'c2089c4172fae3ec54aca2ee9bbf4a1919d5c9e5':