| commit | 9961115febd977da027922aceb16d608cc4388ce | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 14:47:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:47:11 2015 +0000 |
| tree | 74e5954e8cada3449992fde6f86a2680c1623337 | |
| parent | d878761b8cfeafbdd6b1d623f0040f47220c1ca6 [diff] | |
| parent | 80c49f0e2d3a6e8919b3500d398827753c55f944 [diff] |
am 80c49f0e: (-s ours) am 71a80d9f: (-s ours) am baf687ff: (-s ours) Import translations. DO NOT MERGE * commit '80c49f0e2d3a6e8919b3500d398827753c55f944':