tree c2854f9c72d274b559da4fa7dc09d7d534b3c17b
parent 8356b8189cf5d429c60a3f13ff52f1e8f70ff1dd
parent a38f80f184b0604bff81232c2559784cc64e0aea
author Baligh Uddin <baligh@google.com> 1413925296 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413925296 +0000

am a38f80f1: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGE

* commit 'a38f80f184b0604bff81232c2559784cc64e0aea':