| commit | 20626eaee4d24809628064fe2ec8885472f2df7d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 28 07:12:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:12:29 2014 +0000 |
| tree | 83b76d149dd985d7087d90ca03a257d923c000a1 | |
| parent | 07a277092a3741b2d0ffd04995f95a583910635b [diff] | |
| parent | 26aab820630b3b7c63a38984bc5d3da16d479bc8 [diff] |
am 26aab820: (-s ours) am 58bb11e9: (-s ours) am b184b5c6: (-s ours) Import translations. DO NOT MERGE * commit '26aab820630b3b7c63a38984bc5d3da16d479bc8':