tree 5ae3845f53962722935c3ec12d1e4a63def721ae
parent d885ac3bc194fbf8c71e4fc936fd390600bf6ab5
parent 1480f39073e525cdb9feecbc39fdd7e20ab8a036
author Baligh Uddin <baligh@google.com> 1414436020 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414436020 +0000

am 1480f390: (-s ours) am cd2eba3d: (-s ours) Import translations. DO NOT MERGE

* commit '1480f39073e525cdb9feecbc39fdd7e20ab8a036':