tree 46f5f3d8515cd44e2554a4269ee5a103e08f2956
parent dd17f4685cb1855e2c104587a9b23aeacf7a7a8e
parent 012dfef735bde3adda165e5add78b61c1a9862c3
author Baligh Uddin <baligh@google.com> 1351544104 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351544104 -0700

am 012dfef7: (-s ours) am 535d77fc: am 3be76c87: am 6c96757f: (-s ours) Import translations. DO NOT MERGE

* commit '012dfef735bde3adda165e5add78b61c1a9862c3':