| commit | bc73cc58612c13626d9bea05859deef5475f44c2 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:03:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:03:35 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 19e355c8b3001f95733635e0d4ff42dac74fccee [diff] | |
| parent | fb914562e4a1fc81fab90e574c9fd4a677b1e513 [diff] |
am fb914562: (-s ours) am 348df67e: (-s ours) am 542cf02d: (-s ours) am 93e416b2: (-s ours) am fb291f5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit 'fb914562e4a1fc81fab90e574c9fd4a677b1e513':