| commit | f0445a46dfeeb6d4876f79440d2105f159595251 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:40:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:40:46 2015 +0000 |
| tree | f38d5cfdaddb84a32e1734e42279b991a3edde46 | |
| parent | aad013a84cbfd11d671fc62139a0edeb266ba581 [diff] | |
| parent | 738e8bbcefc1060cf9771576f77e7714bc9c17d2 [diff] |
am 738e8bbc: (-s ours) am 070e7bf9: (-s ours) am c683cef2: (-s ours) am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import translations. DO NOT MERGE * commit '738e8bbcefc1060cf9771576f77e7714bc9c17d2': Import translations. DO NOT MERGE