commit | 2e9a8304302ef84191d29fa62e7f3ef00c636043 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:52:51 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:52:51 2014 +0000 |
tree | 2315f5c39925ed8cc7c5dc072671fa062981055c | |
parent | d3712469862cbaef023b31d494ba7ae11773c5df [diff] | |
parent | c7e670e28f4244324a55f056bcaf5901f3e32829 [diff] |
am c7e670e2: (-s ours) am de4817e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'c7e670e28f4244324a55f056bcaf5901f3e32829': Import translations. DO NOT MERGE