| commit | 19e355c8b3001f95733635e0d4ff42dac74fccee | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:03:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:03:34 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 8e3716fdde1e8afa93d5a2518b5f2916b0ac383f [diff] | |
| parent | 069a695e6b0170edcc7848c78fe4f726bcf935a6 [diff] |
am 069a695e: (-s ours) am 98e5bd3c: (-s ours) am d46f31f6: (-s ours) am eb7ed429: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit '069a695e6b0170edcc7848c78fe4f726bcf935a6':