| commit | 029ccf0ea680905bf1b75b8a241568074aa6cdb6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 21:38:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:38:51 2015 +0000 |
| tree | 9ab022d543b5db33493e73994bbbb5cff5da3902 | |
| parent | 970308026767a9354e9cb609878c3ac26e63b11c [diff] | |
| parent | 3b152dec578b0484c979de779c3d32f62562fa6f [diff] |
am 3b152dec: (-s ours) am c6f21ce0: (-s ours) am dcb985ea: (-s ours) Import translations. DO NOT MERGE * commit '3b152dec578b0484c979de779c3d32f62562fa6f':