| commit | ed5dee9d2cd78e4f290e274cff68958194d1f4d1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:05:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:05:31 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | bc878970d2aece929f4999d58be57f3f1524789d [diff] | |
| parent | c393f3dd393b73639b59c874f94086e21cb476c1 [diff] |
am c393f3dd: (-s ours) am 88485bb5: (-s ours) am 78c7429c: (-s ours) am 0cc0c216: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'c393f3dd393b73639b59c874f94086e21cb476c1':