tree 7b5e0e00d587bf907cd0f0d359e462b5b52a9e73
parent d6db28731137b81216b65343c7908538b2fe3644
parent 535d77fcc21ea292f53a4b6c1c876a7e7c2d98fb
author Baligh Uddin <baligh@google.com> 1351543932 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351543932 -0700

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

* commit '535d77fcc21ea292f53a4b6c1c876a7e7c2d98fb':