| commit | b7bb3e73ebad4f562cd390aae8df829a9614eb03 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:32:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:32:25 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 8a11f4bc4659efb776ca96f742b78063f6c3e8f0 [diff] | |
| parent | cd0f6e0cd5ab3271897064b28cecc50c0a481ca8 [diff] |
am cd0f6e0c: (-s ours) am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'cd0f6e0cd5ab3271897064b28cecc50c0a481ca8':