| commit | fc6dab311751300cde3031626d3dbacfd15614fc | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:32:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:32:32 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 784bbb1793821349bf77c3e4764967f822b54bdd [diff] | |
| parent | 9b4d5a425be9f641076f32da863b04e009de1922 [diff] |
am 9b4d5a42: (-s ours) am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '9b4d5a425be9f641076f32da863b04e009de1922':