| commit | a1088e4a7599cbcc349efcd568ff11929d377ce6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:26:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:26:23 2015 +0000 |
| tree | 54650e0e7fe52ca077756e08f3d1930934cff7e0 | |
| parent | f96891537685d96709013da4d4ab1e51d9b96a1e [diff] | |
| parent | e15a5b169c52cdb718bebf0ba496353b81202075 [diff] |
am e15a5b16: (-s ours) am 7011e6de: (-s ours) am f221299b: (-s ours) am d6d398e6: (-s ours) Import translations. DO NOT MERGE * commit 'e15a5b169c52cdb718bebf0ba496353b81202075': Import translations. DO NOT MERGE