| commit | 069a695e6b0170edcc7848c78fe4f726bcf935a6 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:28:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:28:11 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | e7492cbf6abb02f28eab5649abc2cce351f9a77e [diff] | |
| parent | 98e5bd3c3f94a159e8c5da8eb5b3bd086f6c4d8d [diff] |
am 98e5bd3c: (-s ours) am d46f31f6: (-s ours) am eb7ed429: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '98e5bd3c3f94a159e8c5da8eb5b3bd086f6c4d8d':