| commit | 37828eecda9f092ac89c75d80f73d3315eaba838 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:07:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:07:16 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 9707b74dd6a7b73c22043e7e760d763829f11040 [diff] | |
| parent | b7bb3e73ebad4f562cd390aae8df829a9614eb03 [diff] |
am b7bb3e73: (-s ours) am cd0f6e0c: (-s ours) am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'b7bb3e73ebad4f562cd390aae8df829a9614eb03':